projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.
[gnulib.git]
/
m4
/
malloc.m4
diff --git
a/m4/malloc.m4
b/m4/malloc.m4
index
893c6e2
..
cb5cff3
100644
(file)
--- a/
m4/malloc.m4
+++ b/
m4/malloc.m4
@@
-1,18
+1,19
@@
-#serial
3
+#serial
6
dnl From Jim Meyering.
dnl Determine whether malloc accepts 0 as its argument.
dnl If it doesn't, arrange to use the replacement function.
dnl
dnl From Jim Meyering.
dnl Determine whether malloc accepts 0 as its argument.
dnl If it doesn't, arrange to use the replacement function.
dnl
-AC_DEFUN(
jm_FUNC_MALLOC
,
+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.
[
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
[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,
],
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
jm_cv_func_working_malloc=no)
])
if test $jm_cv_func_working_malloc = no; then
- LIBOBJS="$LIBOBJS malloc.o"
- AC_DEFINE
_UNQUOTED
(malloc, rpl_malloc,
+ AC_LIBOBJ(malloc)
+ AC_DEFINE(malloc, rpl_malloc,
[Define to rpl_malloc if the replacement function should be used.])
fi
])
[Define to rpl_malloc if the replacement function should be used.])
fi
])