Test _MSDOS_, not MSDOS.

[bison.git] / src / bison.s1

diff --git a/src/bison.s1 b/src/bison.s1
index 5a9cac458396a41073852418b06dd4841be13c51..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 (__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>
 #include <malloc.h>

-#else /* not MSDOS, or __TURBOC__ */
+#else /* not _MSDOS_, or __TURBOC__ */

 #if defined(_AIX)
 #include <malloc.h>
  #pragma alloca
 #if defined(_AIX)
 #include <malloc.h>
  #pragma alloca


@@ -47,7 +49,7 @@ void *alloca ();
 #endif /* not __cplusplus */
 #endif /* __hpux */
 #endif /* not _AIX */
 #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.  */
 #endif /* not sparc.  */
 #endif /* not GNU C.  */
 #endif /* alloca not defined.  */


@@ -154,16 +156,16 @@ int yyparse (void);
 #endif
 \f
 #if __GNUC__ > 1               /* GNU C and GNU C++ define this.  */
 #endif
 \f
 #if __GNUC__ > 1               /* GNU C and GNU C++ define this.  */

-#define __yy_memcpy(FROM,TO,COUNT)     __builtin_memcpy(TO,FROM,COUNT)
+#define __yy_memcpy(TO,FROM,COUNT)     __builtin_memcpy(TO,FROM,COUNT)

 #else                          /* not GNU C or C++ */
 #ifndef __cplusplus
 
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void
 #else                          /* not GNU C or C++ */
 #ifndef __cplusplus
 
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void

-__yy_memcpy (from, to, count)
-     char *from;
+__yy_memcpy (to, from, count)

      char *to;
      char *to;

+     char *from;

      int count;
 {
   register char *f = from;
      int count;
 {
   register char *f = from;


@@ -179,10 +181,10 @@ __yy_memcpy (from, to, count)
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void

-__yy_memcpy (char *from, char *to, int count)
+__yy_memcpy (char *to, char *from, int count)

 {
 {

-  register char *f = from;

   register char *t = to;
   register char *t = to;

+  register char *f = from;

   register int i = count;
 
   while (i-- > 0)
   register int i = count;
 
   while (i-- > 0)


@@ -331,12 +333,12 @@ yynewstate:
       if (yystacksize > YYMAXDEPTH)
        yystacksize = YYMAXDEPTH;
       yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
       if (yystacksize > YYMAXDEPTH)
        yystacksize = YYMAXDEPTH;
       yyss = (short *) alloca (yystacksize * sizeof (*yyssp));

-      __yy_memcpy ((char *)yyss1, (char *)yyss, size * sizeof (*yyssp));
+      __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));

       yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
       yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));

-      __yy_memcpy ((char *)yyvs1, (char *)yyvs, size * sizeof (*yyvsp));
+      __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));

 #ifdef YYLSP_NEEDED
       yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
 #ifdef YYLSP_NEEDED
       yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));

-      __yy_memcpy ((char *)yyls1, (char *)yyls, size * sizeof (*yylsp));
+      __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));

 #endif
 #endif /* no yyoverflow */
 
 #endif
 #endif /* no yyoverflow */