Test _MSDOS_, not MSDOS.

[bison.git] / src / bison.s1

diff --git a/src/bison.s1 b/src/bison.s1
index aea6b78c20a000d3f7a5713fdff9b809879bac7b..1c853745745b9a9dbbf3cbe5b4911c1d6ff1fe16 100644 (file)
--- 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.  */
@@ -181,8 +183,8 @@ __yy_memcpy (to, from, count)
 static void
 __yy_memcpy (char *to, char *from, int count)
 {
-  register char *f = from;
   register char *t = to;
+  register char *f = from;
   register int i = count;
 
   while (i-- > 0)