Assume C89; don't check for stdlib.h, string.h, genenv, malloc.

diff --git a/lib/addext.c b/lib/addext.c
index 7753c608aa350b2e70bee07e2924dfde63363d0d..fff64f7c7b7ba75f44fbbbb7fcab711517483fd2 100644 (file)
--- a/lib/addext.c
+++ b/lib/addext.c
@@ -37,11 +37,7 @@
 #endif
 
 #include <stddef.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
 
 #if HAVE_UNISTD_H
 # include <unistd.h>

diff --git a/lib/backupfile.c b/lib/backupfile.c
index 34bde3cab56614c45bce32b5f958ab0b13f76691..7ea76b49e7853516b2938b0fa0170eb4f590f7e1 100644 (file)
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -27,11 +27,7 @@
 
 #include <stddef.h>
 #include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
 
 #if HAVE_DIRENT_H
 # include <dirent.h>
@@ -57,23 +53,7 @@
 # define CLOSEDIR(d) closedir (d)
 #endif
 
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#ifndef HAVE_DECL_GETENV
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_GETENV
-char *getenv ();
-#endif
-
-#ifndef HAVE_DECL_MALLOC
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_MALLOC
-char *malloc ();
-#endif
+#include <stdlib.h>
 
 #if HAVE_DIRENT_H || HAVE_NDIR_H || HAVE_SYS_DIR_H || HAVE_SYS_NDIR_H
 # define HAVE_DIR 1

diff --git a/m4/backupfile.m4 b/m4/backupfile.m4
index 1326bb2ab407ea39a6a578dce2a65d3aa249191e..f3c2aa5d5d28af1a9ea71c40af4316dd2bc1695d 100644 (file)
--- a/m4/backupfile.m4
+++ b/m4/backupfile.m4
@@ -1,4 +1,4 @@
-# backupfile.m4 serial 2
+# backupfile.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -11,13 +11,11 @@ AC_DEFUN([gl_BACKUPFILE],
   dnl Prerequisites of lib/backupfile.c.
   AC_REQUIRE([AC_HEADER_DIRENT])
   AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID])
-  AC_CHECK_HEADERS_ONCE(stdlib.h string.h)
-  AC_CHECK_DECLS_ONCE(getenv malloc)
   jm_CHECK_TYPE_STRUCT_DIRENT_D_INO
 
   dnl Prerequisites of lib/addext.c.
   AC_REQUIRE([jm_AC_DOS])
-  AC_SYS_LONG_FILE_NAMES
-  AC_CHECK_HEADERS_ONCE(string.h unistd.h)
+  AC_REQUIRE([AC_SYS_LONG_FILE_NAMES])
+  AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_CHECK_FUNCS(pathconf)
 ])