From da4083c7815a49b4aab3e30dc8d47d45b7706b65 Mon Sep 17 00:00:00 2001
From: Craig Rodrigues <rodrigc@gcc.gnu.org>
Date: Tue, 13 Nov 2001 03:20:58 +0000
Subject: [PATCH] re PR bootstrap/3451 (AIX 4.3.2 redefinition of macro)

	PR bootstrap/3451
	* c-pragma.c: Rename macros BAD, BAD2, BAD_ACTION to
	GCC_BAD, GCC_BAD2, GCC_BAD_ACTION.

From-SVN: r46972
---
 gcc/ChangeLog  |  6 ++++++
 gcc/c-pragma.c | 38 +++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a2fd39b3955..a57d9503a39 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-12  Craig Rodrigues  <rodrigc@gcc.gnu.org>
+
+	PR bootstrap/3451
+	* c-pragma.c: Rename macros BAD, BAD2, BAD_ACTION to
+	GCC_BAD, GCC_BAD2, GCC_BAD_ACTION.
+
 2001-11-12  David O'Brien  <obrien@FreeBSD.org>
 
 	* config.gcc (sparc-tti-*, sparc64-wrs-vxworks*, sparc-wrs-vxworks*,
diff --git a/gcc/c-pragma.c b/gcc/c-pragma.c
index 0d1caaff486..f0c2b4012e3 100644
--- a/gcc/c-pragma.c
+++ b/gcc/c-pragma.c
@@ -33,8 +33,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "output.h"
 #include "tm_p.h"
 
-#define BAD(msgid) do { warning (msgid); return; } while (0)
-#define BAD2(msgid, arg) do { warning (msgid, arg); return; } while (0)
+#define GCC_BAD(msgid) do { warning (msgid); return; } while (0)
+#define GCC_BAD2(msgid, arg) do { warning (msgid, arg); return; } while (0)
 
 #ifdef HANDLE_PRAGMA_PACK
 static void handle_pragma_pack PARAMS ((cpp_reader *));
@@ -159,9 +159,9 @@ mark_align_stack (p)
 #else  /* not HANDLE_PRAGMA_PACK_PUSH_POP */
 #define SET_GLOBAL_ALIGNMENT(ALIGN) (maximum_field_alignment = (ALIGN))
 #define push_alignment(ID, N) \
-    BAD("#pragma pack(push[, id], <n>) is not supported on this target")
+    GCC_BAD("#pragma pack(push[, id], <n>) is not supported on this target")
 #define pop_alignment(ID) \
-    BAD("#pragma pack(pop[, id], <n>) is not supported on this target")
+    GCC_BAD("#pragma pack(pop[, id], <n>) is not supported on this target")
 #endif /* HANDLE_PRAGMA_PACK_PUSH_POP */
 
 /* #pragma pack ()
@@ -181,7 +181,7 @@ handle_pragma_pack (dummy)
   enum { set, push, pop } action;
 
   if (c_lex (&x) != CPP_OPEN_PAREN)
-    BAD ("missing '(' after '#pragma pack' - ignored");
+    GCC_BAD ("missing '(' after '#pragma pack' - ignored");
 
   token = c_lex (&x);
   if (token == CPP_CLOSE_PAREN)
@@ -194,14 +194,14 @@ handle_pragma_pack (dummy)
       align = TREE_INT_CST_LOW (x);
       action = set;
       if (c_lex (&x) != CPP_CLOSE_PAREN)
-	BAD ("malformed '#pragma pack' - ignored");
+	GCC_BAD ("malformed '#pragma pack' - ignored");
     }
   else if (token == CPP_NAME)
     {
-#define BAD_ACTION do { if (action == push) \
-	  BAD ("malformed '#pragma pack(push[, id], <n>)' - ignored"); \
+#define GCC_BAD_ACTION do { if (action == push) \
+	  GCC_BAD ("malformed '#pragma pack(push[, id], <n>)' - ignored"); \
 	else \
-	  BAD ("malformed '#pragma pack(pop[, id])' - ignored"); \
+	  GCC_BAD ("malformed '#pragma pack(pop[, id])' - ignored"); \
 	} while (0)
 
       const char *op = IDENTIFIER_POINTER (x);
@@ -210,11 +210,11 @@ handle_pragma_pack (dummy)
       else if (!strcmp (op, "pop"))
 	action = pop;
       else
-	BAD2 ("unknown action '%s' for '#pragma pack' - ignored", op);
+	GCC_BAD2 ("unknown action '%s' for '#pragma pack' - ignored", op);
 
       token = c_lex (&x);
       if (token != CPP_COMMA && action == push)
-	BAD_ACTION;
+	GCC_BAD_ACTION;
 
       if (token == CPP_COMMA)
 	{
@@ -223,7 +223,7 @@ handle_pragma_pack (dummy)
 	    {
 	      id = x;
 	      if (action == push && c_lex (&x) != CPP_COMMA)
-		BAD_ACTION;
+		GCC_BAD_ACTION;
 	      token = c_lex (&x);
 	    }
 
@@ -235,16 +235,16 @@ handle_pragma_pack (dummy)
 		  token = c_lex (&x);
 		}
 	      else
-		BAD_ACTION;
+		GCC_BAD_ACTION;
 	    }
 	}
 
       if (token != CPP_CLOSE_PAREN)
-	BAD_ACTION;
-#undef BAD_ACTION
+	GCC_BAD_ACTION;
+#undef GCC_BAD_ACTION
     }
   else
-    BAD ("malformed '#pragma pack' - ignored");
+    GCC_BAD ("malformed '#pragma pack' - ignored");
 
   if (c_lex (&x) != CPP_EOF)
     warning ("junk at end of '#pragma pack'");
@@ -261,7 +261,7 @@ handle_pragma_pack (dummy)
 	align *= BITS_PER_UNIT;
 	break;
       default:
-	BAD2 ("alignment must be a small power of two, not %d", align);
+	GCC_BAD2 ("alignment must be a small power of two, not %d", align);
       }
 
   switch (action)
@@ -287,12 +287,12 @@ handle_pragma_weak (dummy)
   value = 0;
 
   if (c_lex (&name) != CPP_NAME)
-    BAD ("malformed #pragma weak, ignored");
+    GCC_BAD ("malformed #pragma weak, ignored");
   t = c_lex (&x);
   if (t == CPP_EQ)
     {
       if (c_lex (&value) != CPP_NAME)
-	BAD ("malformed #pragma weak, ignored");
+	GCC_BAD ("malformed #pragma weak, ignored");
       t = c_lex (&x);
     }
   if (t != CPP_EOF)
-- 
2.30.2