Use `#if !HAVE_DECL...' instead of `#ifndef HAVE_DECL..'

now that autoconf always defines the HAVE_DECL_ symbols.

Arrange for cpp to fail if the configure-time
declaration check was not run.

diff --git a/lib/backupfile.c b/lib/backupfile.c
index 7f4da17..94f22de 100644 (file)
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -1,5 +1,5 @@
 /* backupfile.c -- make Emacs style backup file names
-   Copyright (C) 1990-1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1990-1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -65,6 +65,9 @@ char *malloc ();
 #endif
 
 #ifndef HAVE_DECL_GETENV
+'this configure-time declaration test was not run'
+#endif
+#if !HAVE_DECL_GETENV
 char *getenv ();
 #endif
 

diff --git a/lib/human.c b/lib/human.c
index 600614e..9c2c16a 100644 (file)
--- a/lib/human.c
+++ b/lib/human.c
@@ -1,5 +1,5 @@
 /* human.c -- print human readable file size
-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,6 +44,9 @@
 #endif
 
 #ifndef HAVE_DECL_GETENV
+'this configure-time declaration test was not run'
+#endif
+#if !HAVE_DECL_GETENV
 char *getenv ();
 #endif
 

diff --git a/lib/same.c b/lib/same.c
index 930ca0b..cdf6452 100644 (file)
--- a/lib/same.c
+++ b/lib/same.c
@@ -50,6 +50,9 @@ extern int errno;
 #define STREQ(a, b) (strcmp ((a), (b)) == 0)
 
 #ifndef HAVE_DECL_FREE
+'this configure-time declaration test was not run'
+#endif
+#if !HAVE_DECL_FREE
 void free ();
 #endif
 

diff --git a/lib/strtoumax.c b/lib/strtoumax.c
index 1642e97..22b9a3d 100644 (file)
--- a/lib/strtoumax.c
+++ b/lib/strtoumax.c
@@ -38,10 +38,16 @@
 #endif
 
 #ifndef HAVE_DECL_STRTOUL
+'this configure-time declaration test was not run'
+#endif
+#if !HAVE_DECL_STRTOUL
 unsigned long long strtoul PARAMS ((char const *, char **, int));
 #endif
 
 #ifndef HAVE_DECL_STRTOULL
+'this configure-time declaration test was not run'
+#endif
+#if !HAVE_DECL_STRTOULL
 unsigned long long strtoull PARAMS ((char const *, char **, int));
 #endif