From: DJ Delorie <dj@redhat.com>
Date: Mon, 14 Feb 2005 12:10:25 +0000 (+0000)
Subject: merge from gcc
X-Git-Tag: binutils-2_16-branchpoint~289
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8adce22da6e4805b565e6519d112e93f2a09814c;p=external%2Fbinutils.git

merge from gcc
---

diff --git a/include/ChangeLog b/include/ChangeLog
index 2818977..2d85bd3 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-14  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/19818
+	* ansidecl.h (PARAMS): Guard from redefinition.
+
 2005-02-03  Alan Modra  <amodra@bigpond.net.au>
 
 	* bfdlink.h (struct bfd_link_hash_entry): Add u.undef.weak.
diff --git a/include/ansidecl.h b/include/ansidecl.h
index 04c3a30..2eeccf2 100644
--- 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)