From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 30 Jul 1996 04:37:16 +0000 (+0000)
Subject: Test _MSDOS_, not MSDOS.
X-Git-Tag: GNU_ORIG~24
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/db245ba8122d8c4bc888a3b7940d649c1dcd9ff7?ds=sidebyside

Test _MSDOS_, not MSDOS.
---

diff --git a/bison.simple b/bison.simple
index cc651ae5..1c853745 100644
--- a/bison.simple
+++ b/bison.simple
@@ -30,9 +30,11 @@
 #if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
 #include <alloca.h>
 #else /* not sparc */
-#if defined (MSDOS) && !defined (__TURBOC__)
+/* This used to test MSDOS, but that is a bad idea
+   since that is in the user namespace.  */
+#if defined (_MSDOS_) && !defined (__TURBOC__)
 #include <malloc.h>
-#else /* not MSDOS, or __TURBOC__ */
+#else /* not _MSDOS_, or __TURBOC__ */
 #if defined(_AIX)
 #include <malloc.h>
  #pragma alloca
@@ -47,7 +49,7 @@ void *alloca ();
 #endif /* not __cplusplus */
 #endif /* __hpux */
 #endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
+#endif /* not _MSDOS_, or __TURBOC__ */
 #endif /* not sparc.  */
 #endif /* not GNU C.  */
 #endif /* alloca not defined.  */
diff --git a/src/bison.s1 b/src/bison.s1
index cc651ae5..1c853745 100644
--- a/src/bison.s1
+++ b/src/bison.s1
@@ -30,9 +30,11 @@
 #if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
 #include <alloca.h>
 #else /* not sparc */
-#if defined (MSDOS) && !defined (__TURBOC__)
+/* This used to test MSDOS, but that is a bad idea
+   since that is in the user namespace.  */
+#if defined (_MSDOS_) && !defined (__TURBOC__)
 #include <malloc.h>
-#else /* not MSDOS, or __TURBOC__ */
+#else /* not _MSDOS_, or __TURBOC__ */
 #if defined(_AIX)
 #include <malloc.h>
  #pragma alloca
@@ -47,7 +49,7 @@ void *alloca ();
 #endif /* not __cplusplus */
 #endif /* __hpux */
 #endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
+#endif /* not _MSDOS_, or __TURBOC__ */
 #endif /* not sparc.  */
 #endif /* not GNU C.  */
 #endif /* alloca not defined.  */
diff --git a/src/bison.simple b/src/bison.simple
index cc651ae5..1c853745 100644
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -30,9 +30,11 @@
 #if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
 #include <alloca.h>
 #else /* not sparc */
-#if defined (MSDOS) && !defined (__TURBOC__)
+/* This used to test MSDOS, but that is a bad idea
+   since that is in the user namespace.  */
+#if defined (_MSDOS_) && !defined (__TURBOC__)
 #include <malloc.h>
-#else /* not MSDOS, or __TURBOC__ */
+#else /* not _MSDOS_, or __TURBOC__ */
 #if defined(_AIX)
 #include <malloc.h>
  #pragma alloca
@@ -47,7 +49,7 @@ void *alloca ();
 #endif /* not __cplusplus */
 #endif /* __hpux */
 #endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
+#endif /* not _MSDOS_, or __TURBOC__ */
 #endif /* not sparc.  */
 #endif /* not GNU C.  */
 #endif /* alloca not defined.  */