4 files changed, 8 insertions, 6 deletions
diff --git a/gcc/config/i386/sol2.h b/gcc/config/i386/sol2.h
index 0c61d48..9ed50f7 100644
--- a/gcc/config/i386/sol2.h
+++ b/gcc/config/i386/sol2.h
@@ -127,7 +127,7 @@ Boston, MA 02111-1307, USA.  */
    || (CHAR) == 'h' \
    || (CHAR) == 'z')
 
-#define STDC_0_IN_SYSTEM_HEADERS
+#define STDC_0_IN_SYSTEM_HEADERS 1
 
 #undef LOCAL_LABEL_PREFIX
 #define LOCAL_LABEL_PREFIX "."
diff --git a/gcc/config/rs6000/sol2.h b/gcc/config/rs6000/sol2.h
index 344f3ae..00ccd49 100644
--- a/gcc/config/rs6000/sol2.h
+++ b/gcc/config/rs6000/sol2.h
@@ -171,4 +171,4 @@ while (0)
 #undef	MULTILIB_DEFAULTS
 #define	MULTILIB_DEFAULTS { "mlittle", "mcall-solaris" }
 
-#define STDC_0_IN_SYSTEM_HEADERS
+#define STDC_0_IN_SYSTEM_HEADERS 1
diff --git a/gcc/config/sparc/sol2.h b/gcc/config/sparc/sol2.h
index 2b38152..3872295 100644
--- a/gcc/config/sparc/sol2.h
+++ b/gcc/config/sparc/sol2.h
@@ -185,7 +185,7 @@ Boston, MA 02111-1307, USA.  */
 /* But indicate that it isn't supported by the hardware.  */
 #define WIDEST_HARDWARE_FP_SIZE 64
 
-#define STDC_0_IN_SYSTEM_HEADERS
+#define STDC_0_IN_SYSTEM_HEADERS 1
 
 #define MULDI3_LIBCALL "__mul64"
 #define DIVDI3_LIBCALL "__div64"
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index 484ce03..d4bf337 100644
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -29,6 +29,10 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "cpplib.h"
 #include "cpphash.h"
 
+#ifndef STDC_0_IN_SYSTEM_HEADERS
+#define STDC_0_IN_SYSTEM_HEADERS 0 /* Boolean macro.  */
+#endif
+
 struct cpp_macro
 {
   cpp_hashnode **params;	/* Parameters, if any.  */
@@ -189,11 +193,9 @@ builtin_macro (pfile, token)
       {
 	int stdc = 1;
 
-#ifdef STDC_0_IN_SYSTEM_HEADERS
-	if (CPP_IN_SYSTEM_HEADER (pfile)
+	if (STDC_0_IN_SYSTEM_HEADERS && CPP_IN_SYSTEM_HEADER (pfile)
 	    && pfile->spec_nodes.n__STRICT_ANSI__->type == NT_VOID)
 	  stdc = 0;
-#endif
 	make_number_token (pfile, token, stdc);
       }
       break;