1 --- gettext/gettext-runtime/intl/libgnuintl.h.in 2006-12-03 17:42:40.265625000 -0500
2 +++ gettext/gettext-runtime/intl/libgnuintl.h.in 2006-12-04 19:27:03.125000000 -0500
4 If he doesn't, we choose the method. A third possible method is
5 _INTL_REDIRECT_ASM, supported only by GCC. */
6 #if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
7 -# if __GNUC__ >= 2 && !(__APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
8 +# if __GNUC__ >= 2 && !((defined __APPLE_CC__) && (__APPLE_CC__ > 1)) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
9 # define _INTL_REDIRECT_ASM
13 /* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
14 its n-th argument literally. This enables GCC to warn for example about
15 printf (gettext ("foo %y")). */
16 -#if __GNUC__ >= 3 && !(__APPLE_CC__ > 1 && defined __cplusplus)
17 +#if __GNUC__ >= 3 && !((defined __APPLE_CC__) && (__APPLE_CC__ > 1) && defined __cplusplus)
18 # define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
20 # define _INTL_MAY_RETURN_STRING_ARG(n)