diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 764578f4393..37379643aaf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-20  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* gansidecl.h (const): Check __STDC__ before undef'ing `const'.
+
 2000-11-20  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* c-typeck.c (build_conditional_expr): When merging type
diff --git a/gcc/gansidecl.h b/gcc/gansidecl.h
index 4bd3bcc2fa8..c64cee5bc2e 100644
--- a/gcc/gansidecl.h
+++ b/gcc/gansidecl.h
@@ -35,7 +35,9 @@ Boston, MA 02111-1307, USA.  */
    gcc header files in case they use these keywords.  Otherwise
    conflicts might occur. */
 #if (GCC_VERSION >= 2007)
-# undef const
+# ifdef __STDC__
+#  undef const
+# endif
 # undef inline
 # define inline __inline__  /* Modern gcc can use `__inline__' freely. */
 # ifndef HAVE_LONG_DOUBLE