Header guard bug.

[bison.git] / m4 / realloc.m4

diff --git a/m4/realloc.m4 b/m4/realloc.m4
index bfbef0c1652503b94734b6f6752c62e77a38aaeb..966f0f54022f392d65b913bbe7bfc63d8577a4c5 100644 (file)
--- a/m4/realloc.m4
+++ b/m4/realloc.m4
@@ -1,18 +1,19 @@
-#serial 3
+#serial 6

 
 dnl From Jim Meyering.
 dnl Determine whether realloc works when both arguments are 0.
 dnl If it doesn't, arrange to use the replacement function.
 dnl
 
 
 dnl From Jim Meyering.
 dnl Determine whether realloc works when both arguments are 0.
 dnl If it doesn't, arrange to use the replacement function.
 dnl
 

-AC_DEFUN(jm_FUNC_REALLOC,
+AC_DEFUN([jm_FUNC_REALLOC],

 [
  dnl xmalloc.c requires that this symbol be defined so it doesn't
  dnl mistakenly use a broken realloc -- as it might if this test were omitted.
 [
  dnl xmalloc.c requires that this symbol be defined so it doesn't
  dnl mistakenly use a broken realloc -- as it might if this test were omitted.

- AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_REALLOC_CHECK, 1,
-                    [Define if the realloc check has been performed. ])
+ AC_DEFINE(HAVE_DONE_WORKING_REALLOC_CHECK, 1,
+           [Define if the realloc check has been performed. ])

 
 

- AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc,
+ AC_CACHE_CHECK([whether realloc(0,0) returns a non-NULL pointer],
+                jm_cv_func_working_realloc,

   [AC_TRY_RUN([
     char *realloc ();
     int
   [AC_TRY_RUN([
     char *realloc ();
     int


@@ -23,13 +24,17 @@ AC_DEFUN(jm_FUNC_REALLOC,
          ],
         jm_cv_func_working_realloc=yes,
         jm_cv_func_working_realloc=no,
          ],
         jm_cv_func_working_realloc=yes,
         jm_cv_func_working_realloc=no,

-        dnl When crosscompiling, assume realloc is broken.
+        dnl When crosscompiling, assume realloc(0,0) returns NULL.

         jm_cv_func_working_realloc=no)
   ])
         jm_cv_func_working_realloc=no)
   ])

-  if test $jm_cv_func_working_realloc = no; then
-    AC_SUBST(LIBOBJS)
-    LIBOBJS="$LIBOBJS realloc.$ac_objext"
-    AC_DEFINE_UNQUOTED(realloc, rpl_realloc,
+  if test $jm_cv_func_working_realloc = yes; then
+    AC_DEFINE([HAVE_REALLOC], 1,
+             [Define to 1 if your system has a working `realloc' function,
+              and to 0 otherwise.])
+  else
+    AC_DEFINE([HAVE_REALLOC], 0)
+    AC_LIBOBJ(realloc)
+    AC_DEFINE(realloc, rpl_realloc,

       [Define to rpl_realloc if the replacement function should be used.])
   fi
 ])
       [Define to rpl_realloc if the replacement function should be used.])
   fi
 ])