acconfig.h: Define `const' to the empty string if neither __STDC__ nor __cplusplus...

	* acconfig.h: Define `const' to the empty string if neither
	__STDC__ nor __cplusplus is defined.
	* config.in: Regenerated.

From-SVN: r39272

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 22a392ade71251a4631f3046dfdaa7241f36e7aa..4a7417f9bd26cbf7111e98b2d01c5a1695966b7a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-25  Mark Mitchell  <mark@codesourcery.com>
+
+       * acconfig.h: Define `const' to the empty string if neither
+       __STDC__ nor __cplusplus is defined.
+       * config.in: Regenerated.
+
 2001-01-25  David Edelsohn  <edelsohn@gnu.org>
 
        * config.gcc (rs6000-ibm-aix[5-9]*): Change to aix51.h.

diff --git a/gcc/acconfig.h b/gcc/acconfig.h
index 3e8c595e484de79b72941bf5a1815c53c7eed7d4..dec619b84b0e42579dbd1bbea029c4888ae84b74 100644 (file)
--- a/gcc/acconfig.h
+++ b/gcc/acconfig.h
@@ -25,3 +25,17 @@
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef ssize_t
+
+@BOTTOM@
+
+/* Bison unconditionally undefines `const' if neither `__STDC__' nor
+   __cplusplus are defined.  That's a problem since we use `const' in
+   the GCC headers, and the resulting bison code is therefore type
+   unsafe.  Thus, we must match the bison behavior here.  */
+
+#ifndef __STDC__
+#ifndef __cplusplus
+#undef const
+#define const
+#endif
+#endif

diff --git a/gcc/config.in b/gcc/config.in
index 497820e3ee14e55875a457ccc78b750b2280e953..a4336876c5671c0f9a4dea157a64bf66b71a2bc1 100644 (file)
--- a/gcc/config.in
+++ b/gcc/config.in
@@ -452,3 +452,15 @@
 /* Define to 1 if you want to enable namespaces (-fhonor-std) by default. */
 #undef ENABLE_STD_NAMESPACE
 
+
+/* Bison unconditionally undefines `const' if neither `__STDC__' nor
+   __cplusplus are defined.  That's a problem since we use `const' in
+   the GCC headers, and the resulting bison code is therefore type
+   unsafe.  Thus, we must match the bison behavior here.  */
+
+#ifndef __STDC__
+#ifndef __cplusplus
+#undef const
+#define const
+#endif
+#endif