merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 281897717099d8fb2835d97427da88c47ab48106..2d85bd3b3dbf242f85e645e5aae6615e80a6f0c8 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-14  Paolo Bonzini  <[email protected]>
+
+       PR bootstrap/19818
+       * ansidecl.h (PARAMS): Guard from redefinition.
+
 2005-02-03  Alan Modra  <[email protected]>
 
        * bfdlink.h (struct bfd_link_hash_entry): Add u.undef.weak.

diff --git a/include/ansidecl.h b/include/ansidecl.h
index 04c3a30bb53bfa3204d61983d16b23067aea5f14..2eeccf203514e6d11a8979fdaeba308837cbea18 100644 (file)
--- a/include/ansidecl.h
+++ b/include/ansidecl.h
@@ -149,7 +149,12 @@ So instead we use the macro below and test it against specific values.  */
 #define PTRCONST       void *const
 #define LONG_DOUBLE    long double
 
+/* PARAMS is often defined elsewhere (e.g. by libintl.h), so wrap it in
+   a #ifndef.  */
+#ifndef PARAMS
 #define PARAMS(ARGS)           ARGS
+#endif
+
 #define VPARAMS(ARGS)          ARGS
 #define VA_START(VA_LIST, VAR) va_start(VA_LIST, VAR)