From dc1d3ff6a0726a9946464e8502e7cbb41af629f2 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Mon, 14 Feb 2005 12:10:25 +0000
Subject: merge from gcc

---
 include/ansidecl.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'include/ansidecl.h')

diff --git a/include/ansidecl.h b/include/ansidecl.h
index 04c3a30bb..2eeccf203 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)
 
-- 
cgit v1.2.3