summaryrefslogtreecommitdiff
path: root/m4/check-decl.m4
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2000-01-22 13:53:10 +0000
committerJim Meyering <jim@meyering.net>2000-01-22 13:53:10 +0000
commit0f9105c7be57719ea62dda4d0574b47db1581ec4 (patch)
tree48c24da8baea0261dfe2bcdac52da198d16a06c9 /m4/check-decl.m4
parentc4a0e466167ab12861aa3fd0ed2491ed09bf6185 (diff)
downloadcoreutils-0f9105c7be57719ea62dda4d0574b47db1581ec4.tar.xz
Guard inclusion of <stdlib.h> with `#if STDC_HEADERS',
not `#if HAVE_STDLIB_H'. The former wasn't defined. Use #if rather than #ifdef. Add HAVE_DECL_STRTOUL and HAVE_DECL_STRTOULL. (jm_CHECK_DECLARATIONS): Add strtoul strtoull.
Diffstat (limited to 'm4/check-decl.m4')
-rw-r--r--m4/check-decl.m414
1 files changed, 8 insertions, 6 deletions
diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index e482169df..a223bf952 100644
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,4 +1,4 @@
-#serial 5
+#serial 6
dnl This is just a wrapper function to encapsulate this kludge.
dnl Putting it in a separate file like this helps share it between
@@ -7,20 +7,20 @@ AC_DEFUN(jm_CHECK_DECLS,
[
headers='
#include <stdio.h>
-#ifdef HAVE_STRING_H
+#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#else
-# ifdef HAVE_STRINGS_H
+# if HAVE_STRINGS_H
# include <strings.h>
# endif
#endif
-#ifdef HAVE_STDLIB_H
+#if STDC_HEADERS
# include <stdlib.h>
#endif
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
# include <unistd.h>
#endif
'
@@ -38,8 +38,10 @@ AC_DEFUN(jm_CHECK_DECLS,
AC_DEFINE(HAVE_DECL_REALLOC, 1, [Define if this function is declared.])
AC_DEFINE(HAVE_DECL_STPCPY, 1, [Define if this function is declared.])
AC_DEFINE(HAVE_DECL_STRSTR, 1, [Define if this function is declared.])
+ AC_DEFINE(HAVE_DECL_STRTOUL, 1, [Define if this function is declared.])
+ AC_DEFINE(HAVE_DECL_STRTOULL, 1, [Define if this function is declared.])
fi
jm_CHECK_DECLARATIONS($headers, free lseek malloc \
- memchr realloc stpcpy strstr)
+ memchr realloc stpcpy strstr strtoul strtoull)
])