no preprocessing inside string literal

From-SVN: r43604

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 654328d1a42018bc23df328776359c47a3c86bf3..9181638ec8d82f91d36497f9846074afdcfa54ab 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Bruce Korb  <bkorb@gnu.org>
+
+       * gcc/fixinc/fixincl.c(initialize): In very strict ANSI, you cannot
+       use preprocessing directives inside a string literal.  Fixed.
+
 2001-06-26  Jim Wilson  <wilson@redhat.com>
 
        * doc/tm.texi (MAX_LONG_DOUBLE_TYPE_SIZE, INTEL_EXTENDED_IEEE_FORMAT):

diff --git a/gcc/fixinc/fixincl.c b/gcc/fixinc/fixincl.c
index 1f8b22067cd0361f521a5f74d1d0cd0820b0f2f4..08d94f7e34d675072b3e09d11535856756c4b710 100644 (file)
--- a/gcc/fixinc/fixincl.c
+++ b/gcc/fixinc/fixincl.c
@@ -220,12 +220,14 @@ initialize ( argc, argv )
   char** argv;
 {
   static const char var_not_found[] =
+#ifndef __STDC__
+    "fixincl ERROR:  %s environment variable not defined\n"
+#else
     "fixincl ERROR:  %s environment variable not defined\n"
-#ifdef __STDC__
     "each of these must be defined:\n"
-#define _ENV_(v,m,n,t) "\t" n "  - " t "\n"
-ENV_TABLE
-#undef _ENV_
+# define _ENV_(v,m,n,t) "\t" n "  - " t "\n"
+  ENV_TABLE
+# undef _ENV_
 #endif
     ;