From: Bruno Haible Date: Sun, 16 Nov 2003 15:30:49 +0000 (+0000) Subject: Avoid a link error with gcc 2.x on AIX 4. X-Git-Tag: v0.13~78 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9108eb7950eb7f0bd8294227820dc406511105f7;p=thirdparty%2Fgettext.git Avoid a link error with gcc 2.x on AIX 4. --- diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 5651e79e0..2ae50e549 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,8 @@ +2003-11-16 Bruno Haible + + * libgnuintl.h.in (_INTL_REDIRECT_ASM): Don't define on AIX with gcc 2. + Reported by Kouichi Hashikawa . + 2003-10-19 Bruno Haible * hash-string.h (hash_string): Zero-extend each char from the string; diff --git a/gettext-runtime/intl/libgnuintl.h.in b/gettext-runtime/intl/libgnuintl.h.in index d68dede36..3be7eb990 100644 --- a/gettext-runtime/intl/libgnuintl.h.in +++ b/gettext-runtime/intl/libgnuintl.h.in @@ -83,7 +83,7 @@ extern "C" { If he doesn't, we choose the method. A third possible method is _INTL_REDIRECT_ASM, supported only by GCC. */ #if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS) -# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && (defined __STDC__ || defined __cplusplus) +# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus) # define _INTL_REDIRECT_ASM # else # ifdef __cplusplus