From: Bruno Haible Date: Mon, 15 Apr 2002 12:34:24 +0000 (+0000) Subject: Avoid compilation error on MacOS X Server (Darwin 5.3) with Apple's cc. X-Git-Tag: 0.11.2-branchpoint~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2da875eaf6f2adae03a4497fdab88347ee9fec1d;p=thirdparty%2Fgettext.git Avoid compilation error on MacOS X Server (Darwin 5.3) with Apple's cc. --- diff --git a/src/ChangeLog b/src/ChangeLog index db7ae8181..fc31af26e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2002-04-15 Bruno Haible + + * po-lex.h (po_gram_error): Treat Apple's version of GCC like non-GCC. + * po-lex.c (po_gram_error): Likewise. + Reported by Richard S. Blake . + 2002-04-04 Bruno Haible * po-lex.h (po_gram_error): Use __VA_ARGS__ + 0 instead of __VA_ARGS__. diff --git a/src/po-lex.c b/src/po-lex.c index f428dfd6f..7308ed93f 100644 --- a/src/po-lex.c +++ b/src/po-lex.c @@ -77,7 +77,7 @@ int gram_pos_column; #if !(__STDC__ && \ ((defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) \ - || (defined __GNUC__ && __GNUC__ >= 2))) + || (defined __GNUC__ && __GNUC__ >= 2 && !defined __APPLE_CC__))) /* CAUTION: If you change this function, you must also make identical changes to the macro of the same name in src/po-lex.h */ diff --git a/src/po-lex.h b/src/po-lex.h index 351c11680..f984b3d73 100644 --- a/src/po-lex.h +++ b/src/po-lex.h @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc. This file was written by Peter Miller @@ -107,7 +107,7 @@ extern void po_lex_pass_obsolete_entries PARAMS ((bool flag)); } while (0) /* GCC is also smart enough to allow optimizations like this. */ -#elif __STDC__ && defined __GNUC__ && __GNUC__ >= 2 +#elif __STDC__ && defined __GNUC__ && __GNUC__ >= 2 && !defined __APPLE_CC__ /* CAUTION: If you change this macro, you must also make identical changes to the function of the same name in src/po-lex.c */