yann@1: "Fixes" gcc-3.4.0 errors: yann@1: gconv_stubs.c:49: error: conflicting types for '__gconv_close_transform' yann@1: ../iconv/gconv_int.h:131: error: previous declaration of '__gconv_close_transform' was here yann@1: gconv_stubs.c:49: error: conflicting types for '__gconv_close_transform' yann@1: ../iconv/gconv_int.h:131: error: previous declaration of '__gconv_close_transform' was here yann@1: gconv_stubs.c:52: error: conflicting types for '__gconv' yann@1: ../iconv/gconv_int.h:112: error: previous declaration of '__gconv' was here yann@1: gconv_stubs.c:52: error: conflicting types for '__gconv' yann@1: ../iconv/gconv_int.h:112: error: previous declaration of '__gconv' was here yann@1: gconv_stubs.c:54: error: conflicting types for '__gconv_find_transform' yann@1: ../iconv/gconv_int.h:119: error: previous declaration of '__gconv_find_transform' was here yann@1: gconv_stubs.c:54: error: conflicting types for '__gconv_find_transform' yann@1: ../iconv/gconv_int.h:119: error: previous declaration of '__gconv_find_transform' was here yann@1: gconv_stubs.c:56: error: conflicting types for '__gconv_open' yann@1: ../iconv/gconv_int.h:99: error: previous declaration of '__gconv_open' was here yann@1: gconv_stubs.c:56: error: conflicting types for '__gconv_open' yann@1: ../iconv/gconv_int.h:99: error: previous declaration of '__gconv_open' was here yann@1: make[2]: *** [/home/dank/wk/crosstool-0.28-rc4h/build/i686-unknown-linux-gnu/gcc-3.4.0-20040406-glibc-2.1.3/build-glibc/c_stubs/gconv_stubs.o] Error 1 yann@1: make[2]: Leaving directory `/home/dank/wk/crosstool-0.28-rc4h/build/i686-unknown-linux-gnu/gcc-3.4.0-20040406-glibc-2.1.3/glibc-2.1.3/c_stubs' yann@1: yann@1: although the right thing would probably be to declare the yann@1: stubs to have the right attributes. yann@1: yann@1: --- glibc-2.1.3/c_stubs/gconv_stubs.c.old Sun Apr 11 20:25:09 2004 yann@1: +++ glibc-2.1.3/c_stubs/gconv_stubs.c Sun Apr 11 20:29:35 2004 yann@1: @@ -18,7 +18,18 @@ yann@1: Boston, MA 02111-1307, USA. */ yann@1: yann@1: #include yann@1: + yann@1: +/* strange hack workaround for gcc-3.4.0. Might be a better way. */ yann@1: +#define __gconv_close_transform foo__gconv_close_transform yann@1: +#define __gconv foo__gconv yann@1: +#define __gconv_find_transform foo__gconv_find_transform yann@1: +#define __gconv_open foo__gconv_open yann@1: + yann@1: #include yann@1: +#undef __gconv_close_transform yann@1: +#undef __gconv yann@1: +#undef __gconv_find_transform yann@1: +#undef __gconv_open yann@1: yann@1: /* hack for self identification */ yann@1: int __c_stubs_is_compiled_in;