X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fbackupfile.c;h=7ea76b49e7853516b2938b0fa0170eb4f590f7e1;hb=b3b353659ac863c94e9705047710a99fa58fe0b1;hp=d78ce3945fe2e170b374daf1f4590a0def24c7f1;hpb=92295bc4b2a378893386efd3cf8cf9bc31024b59;p=gnulib.git

diff --git a/lib/backupfile.c b/lib/backupfile.c
index d78ce3945..7ea76b49e 100644
--- 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
@@ -111,8 +91,8 @@ char *malloc ();
    to numbered) backup file name. */
 const char *simple_backup_suffix = "~";
 
-static int max_backup_version PARAMS ((const char *, const char *));
-static int version_number PARAMS ((const char *, const char *, size_t));
+static int max_backup_version (const char *, const char *);
+static int version_number (const char *, const char *, size_t);
 
 /* Return the name of the new backup file for file FILE,
    allocated with malloc.  Return 0 if out of memory.