Avoid compilation error on MacOS X Server (Darwin 5.3) with Apple's cc.

diff --git a/src/ChangeLog b/src/ChangeLog
index db7ae8181d2afa07c16694945427f485ee315e44..fc31af26ea7c1bc6e0ccaf4f452ebad3dc1457e4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-15  Bruno Haible  <bruno@clisp.org>
+
+       * 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 <blakers@presence-group.com>.
+
 2002-04-04  Bruno Haible  <bruno@clisp.org>
 
        * 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 f428dfd6fce8c5c7ebec68ab5a96201015c9a844..7308ed93fb19cc19545014e30fae5404b1ca74fc 100644 (file)
--- 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 351c11680f2cb9ac7ef23d826599296e4008cb1e..f984b3d73ff7ff154e5fd82855597b88e6d98ca9 100644 (file)
--- 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 <millerp@canb.auug.org.au>
 
@@ -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  */