X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmalloc.m4;h=cb5cff3c243aca182dfa6b66a1a5c47e0a8eeb8b;hb=cdb16e449503bbdc0cb239ebae9372227c250dfd;hp=05c66ad6a21012deeac28e0456e2efceffc09dd5;hpb=ee76465ad82c04707c78ff3ed723358217c9e34f;p=gnulib.git

diff --git a/m4/malloc.m4 b/m4/malloc.m4
index 05c66ad6a..cb5cff3c2 100644
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -1,4 +1,4 @@
-#serial 5
+#serial 6
 
 dnl From Jim Meyering.
 dnl Determine whether malloc accepts 0 as its argument.
@@ -9,10 +9,11 @@ AC_DEFUN([jm_FUNC_MALLOC],
 [
  dnl xmalloc.c requires that this symbol be defined so it doesn't
  dnl mistakenly use a broken malloc -- as it might if this test were omitted.
- AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_MALLOC_CHECK, 1,
-                    [Define if the malloc check has been performed. ])
+ 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,12 +24,12 @@ 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
     AC_LIBOBJ(malloc)
-    AC_DEFINE_UNQUOTED(malloc, rpl_malloc,
+    AC_DEFINE(malloc, rpl_malloc,
       [Define to rpl_malloc if the replacement function should be used.])
   fi
 ])