* c-common.c (builtin_define_std): Correct logic.

From-SVN: r54089

* c-common.c (builtin_define_std): Correct logic.
From-SVN: r54089
a9da2e5b · Neil Booth · Neil Booth · 6248c4dd · a9da2e5b · a9da2e5b
Commit a9da2e5b authored May 31, 2002 by Neil Booth Committed by Neil Booth May 31, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 4 deletions

gcc/ChangeLog
+4 -0

gcc/c-common.c
+7 -4

No files found.
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
+2002-05-31  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+	* c-common.c (builtin_define_std): Correct logic.
+
 2002-05-31  John David Anglin  <dave@hiauly1.hia.nrc.ca>

 	* pa.c (output_millicode_call): Correct "be,l" insn for TARGET_PA_20.

--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -4440,10 +4440,13 @@ builtin_define_std (macro)

  /* prepend __ (or maybe just _) if in user's namespace.  */
  memcpy (p, macro, len + 1);
-  if (*p != '_')
-    *--p = '_';
-  if (p[1] != '_' && !ISUPPER (p[1]))
-    *--p = '_';
+  if (!( *p == '_' && (p[1] == '_' || ISUPPER (p[1]))))
+    {
+      if (*p != '_')
+	*--p = '_';
+      if (p[1] != '_')
+	*--p = '_';
+    }
  cpp_define (parse_in, p);

  /* If it was in user's namespace...  */