Don't rely on whether alloc is #defined; that is in the user's name spac.

diff --git a/ChangeLog b/ChangeLog
index c2da9f8774016919c3ee9bf6718224cdaa65cbc7..49c6d26cf9e0fa2f7baff7ff14f19f9ea16dcf16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,8 +7,7 @@
 
        * data/yacc.c [YYSTACK_USE_ALLOCA && !defined __GNUC__ && ! defined
        __BUILTIN_VA_ARG_INCR && ! defined _AIX && ! defined _MSC_VER &&
 
        * data/yacc.c [YYSTACK_USE_ALLOCA && !defined __GNUC__ && ! defined
        __BUILTIN_VA_ARG_INCR && ! defined _AIX && ! defined _MSC_VER &&

-       (defined alloca || defined _ALLOCA_H)]: Don't include <stdlib.h>;
-       not needed in this case.
+       defined _ALLOCA_H]: Don't include <stdlib.h>; not needed in this case.

        * tests/torture.at (Exploding the Stack Size with Alloca): Adjust
        to match yacc.c, to test more hosts.
 
        * tests/torture.at (Exploding the Stack Size with Alloca): Adjust
        to match yacc.c, to test more hosts.
 

diff --git a/data/yacc.c b/data/yacc.c
index 9cb7f2f3b49b60aff7a94bdf8920638de6609104..b06837c0acdc34c191599dbf073bfdff2ba55f4a 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -263,7 +263,7 @@ b4_syncline([@oline@], [@ofile@])[
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca

-#    if (! defined (alloca) && ! defined (_ALLOCA_H) && ! defined (_STDLIB_H) \
+#    if (! defined (_ALLOCA_H) && ! defined (_STDLIB_H) \

         && (defined (__STDC__) || defined (__cplusplus)))
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #     ifndef _STDLIB_H
         && (defined (__STDC__) || defined (__cplusplus)))
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #     ifndef _STDLIB_H

diff --git a/tests/torture.at b/tests/torture.at
index e0d8087a83ae48cc53c64059d82e7a904f54df0e..b35052fc450d498d6920d852c21ddaa0deca6785 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -445,7 +445,7 @@ AT_SETUP([Exploding the Stack Size with Alloca])
 
 AT_DATA_STACK_TORTURE([[
 #if (defined __GNUC__ || defined __BUILTIN_VA_ARG_INCR \
 
 AT_DATA_STACK_TORTURE([[
 #if (defined __GNUC__ || defined __BUILTIN_VA_ARG_INCR \

-     || defined _AIX || defined _MSC_VER || defined alloca || defined _ALLOCA_H)
+     || defined _AIX || defined _MSC_VER || defined _ALLOCA_H)

 # define YYSTACK_USE_ALLOCA 1
 #endif
 ]])
 # define YYSTACK_USE_ALLOCA 1
 #endif
 ]])