* data/yacc.c: Guard the declaration of yytoknum also with

[bison.git] / m4 / malloc.m4

diff --git a/m4/malloc.m4 b/m4/malloc.m4
index bb60947dc7460975d7b0d16aae8ae4ad783fd42b..f6d43c9164c7ac97035d8febad39abaa8efce36c 100644 (file)
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -1,4 +1,4 @@
-#serial 5
+#serial 7
 
 dnl From Jim Meyering.
 dnl Determine whether malloc accepts 0 as its argument.
@@ -12,7 +12,8 @@ AC_DEFUN([jm_FUNC_MALLOC],
  AC_DEFINE(HAVE_DONE_WORKING_MALLOC_CHECK, 1,
            [Define if the malloc check has been performed. ])
 
- AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
+ AC_CACHE_CHECK([whether malloc(0) returns a non-NULL pointer],
+                jm_cv_func_working_malloc,
   [AC_TRY_RUN([
     char *malloc ();
     int
@@ -23,10 +24,15 @@ AC_DEFUN([jm_FUNC_MALLOC],
          ],
         jm_cv_func_working_malloc=yes,
         jm_cv_func_working_malloc=no,
-        dnl When crosscompiling, assume malloc is broken.
+        dnl When crosscompiling, assume malloc(0) returns NULL.
         jm_cv_func_working_malloc=no)
   ])
-  if test $jm_cv_func_working_malloc = no; then
+  if test $jm_cv_func_working_malloc = yes; then
+    AC_DEFINE([HAVE_MALLOC], 1,
+             [Define to 1 if your system has a working `malloc' function,
+              and to 0 otherwise.])
+  else
+    AC_DEFINE([HAVE_MALLOC], 0)
     AC_LIBOBJ(malloc)
     AC_DEFINE(malloc, rpl_malloc,
       [Define to rpl_malloc if the replacement function should be used.])