Relaxed tests for __STDC__ and __STDC_VERSION__ to cope with bugs in GCC and Sun cc.

diff --git a/flex.skl b/flex.skl
index 683ead6eb9e6edd8696fab9c00cb40514665fd6f..482d76c671bc8adc539869c4096c9d5a052e07ee 100644 (file)
--- a/flex.skl
+++ b/flex.skl
@@ -200,11 +200,12 @@ m4preproc_include(`flexint.h')
 
 #else  /* ! __cplusplus */
 
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
 
 #define YY_USE_CONST
 
-#endif /* __STDC__ */
+#endif /* defined (__STDC__) */
 #endif /* ! __cplusplus */
 
 #ifdef YY_USE_CONST

diff --git a/flexdef.h b/flexdef.h
index 2f887f4d3102fe6c40819e29bb52fdfac466230b..8e99bb8a6dc9e5ef2ee29de3b6d9d4daf584366d 100644 (file)
--- a/flexdef.h
+++ b/flexdef.h
@@ -94,7 +94,7 @@
 #endif
 
 #ifndef PROTO
-#if __STDC__
+#if defined(__STDC__)
 #define PROTO(proto) proto
 #else
 #define PROTO(proto) ()

diff --git a/flexint.h b/flexint.h
index 40887159c85af6a501690331e399b374681433d4..60e91275e31d1f3024024b249805d5e9f1c26b6f 100644 (file)
--- a/flexint.h
+++ b/flexint.h
@@ -5,7 +5,7 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
  * if you want the limit (max/min) macros for int types. 

diff --git a/misc.c b/misc.c
index 238843705fbdcef932c8b252c1ec28026460d181..171a7898d192c813387f2f9ce4ebaaf8d80f891c 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -629,7 +629,7 @@ Char myesc (array)
        case 't':
                return '\t';
 
-#if __STDC__
+#if defined (__STDC__)
        case 'a':
                return '\a';
        case 'v':
@@ -835,7 +835,7 @@ char   *readable_form (c)
                case '\t':
                        return "\\t";
 
-#if __STDC__
+#if defined (__STDC__)
                case '\a':
                        return "\\a";
                case '\v':