Use a consistent style for including <config.h>.

* __fpending.c, acl.c, argmatch.c,
argp-help.c, argp-parse.c,
argp-pvh.c, backupfile.c, basename.c, c-stack.c,
calloc.c, check-version.c, cloexec.c, closeout.c, copy-file.c,
creat-safer.c, cycle-check.c, dirfd.c, dirname.c, dup-safer.c,
dup2.c, euidaccess.c, exclude.c, exitfail.c, fatal-signal.c,
fd-safer.c, file-type.c, fileblocks.c, filemode.c,
filenamecat.c, findprog.c, fnmatch.c, fopen-safer.c, free.c,
fsusage.c, ftruncate.c, full-write.c, fwriteerror.c,
getaddrinfo.c, getcwd.c, getdelim.c, getline.c, getlogin_r.c,
getndelim2.c, getnline.c, getopt1.c, getpass.c, group-member.c,
hard-locale.c, hash-pjw.c, hash.c, human.c, idcache.c,
inet_ntop.c, isdir.c, long-options.c, malloc.c, memcasecmp.c,
memcmp.c, memcoll.c, memcpy.c, memmove.c, mkdir-p.c,
modechange.c, mountlist.c, open-safer.c, physmem.c,
pipe-safer.c, pipe.c, poll.c, posixver.c, progname.c,
progreloc.c, putenv.c, quote.c, quotearg.c, readline.c,
readlink.c, realloc.c, regex.c, rename.c, rmdir.c, rpmatch.c,
safe-read.c, same.c, save-cwd.c, savedir.c, sig2str.c,
strcspn.c, strerror.c, stripslash.c, strncasecmp.c, strndup.c,
strnlen.c, strnlen1.c, strsep.c, strstr.c, strtod.c,
strtoimax.c, strtol.c, strverscmp.c, tempname.c, time_r.c,
userspec.c, utimecmp.c, version-etc-fsf.c,
version-etc.c, wait-process.c, xalloc-die.c, xgetcwd.c,
xmalloc.c, xmemcoll.c, xnanosleep.c, xreadlink.c, xsetenv.c,
xstrndup.c, xstrtoimax.c, xstrtol.c, xstrtoumax.c, yesno.c:
Standardize inclusion of config.h.
* __fpending.h, dirfd.h, getdate.h, human.h,
inttostr.h:  Removed inclusion of config.h from header files.
* inttostr.c:  Adjusted in-tree users.
* timespec.h: Remove superfluous warning to include config.h.
* atexit.c, chdir-long.c chown.c, fchown-stub.c, getgroups.c,
gettimeofday.c, lchown.c, lstat.c, mkdir.c, mkstemp.c,
nanosleep.c, openat.c, raise.c, readtokens0.c, readutmp.c,
unlinkdir.c: Guard inclusion of config.h with HAVE_CONFIG_H.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 1786690..2c62bb5 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,42 @@
+2005-09-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Use a consistent style for including <config.h>.
+       * __fpending.c, acl.c, argmatch.c,
+       argp-help.c, argp-parse.c,
+       argp-pvh.c, backupfile.c, basename.c, c-stack.c,
+       calloc.c, check-version.c, cloexec.c, closeout.c, copy-file.c,
+       creat-safer.c, cycle-check.c, dirfd.c, dirname.c, dup-safer.c,
+       dup2.c, euidaccess.c, exclude.c, exitfail.c, fatal-signal.c,
+       fd-safer.c, file-type.c, fileblocks.c, filemode.c,
+       filenamecat.c, findprog.c, fnmatch.c, fopen-safer.c, free.c,
+       fsusage.c, ftruncate.c, full-write.c, fwriteerror.c,
+       getaddrinfo.c, getcwd.c, getdelim.c, getline.c, getlogin_r.c,
+       getndelim2.c, getnline.c, getopt1.c, getpass.c, group-member.c,
+       hard-locale.c, hash-pjw.c, hash.c, human.c, idcache.c,
+       inet_ntop.c, isdir.c, long-options.c, malloc.c, memcasecmp.c,
+       memcmp.c, memcoll.c, memcpy.c, memmove.c, mkdir-p.c,
+       modechange.c, mountlist.c, open-safer.c, physmem.c,
+       pipe-safer.c, pipe.c, poll.c, posixver.c, progname.c,
+       progreloc.c, putenv.c, quote.c, quotearg.c, readline.c,
+       readlink.c, realloc.c, regex.c, rename.c, rmdir.c, rpmatch.c,
+       safe-read.c, same.c, save-cwd.c, savedir.c, sig2str.c,
+       strcspn.c, strerror.c, stripslash.c, strncasecmp.c, strndup.c,
+       strnlen.c, strnlen1.c, strsep.c, strstr.c, strtod.c,
+       strtoimax.c, strtol.c, strverscmp.c, tempname.c, time_r.c,
+       userspec.c, utimecmp.c, version-etc-fsf.c,
+       version-etc.c, wait-process.c, xalloc-die.c, xgetcwd.c,
+       xmalloc.c, xmemcoll.c, xnanosleep.c, xreadlink.c, xsetenv.c,
+       xstrndup.c, xstrtoimax.c, xstrtol.c, xstrtoumax.c, yesno.c:
+       Standardize inclusion of config.h.
+       * __fpending.h, dirfd.h, getdate.h, human.h,
+       inttostr.h:  Removed inclusion of config.h from header files.
+       * inttostr.c:  Adjusted in-tree users.
+       * timespec.h: Remove superfluous warning to include config.h.
+       * atexit.c, chdir-long.c chown.c, fchown-stub.c, getgroups.c,
+       gettimeofday.c, lchown.c, lstat.c, mkdir.c, mkstemp.c,
+       nanosleep.c, openat.c, raise.c, readtokens0.c, readutmp.c,
+       unlinkdir.c: Guard inclusion of config.h with HAVE_CONFIG_H.
+
 2005-09-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        * stat-time.h: New file.

diff --git a/lib/__fpending.c b/lib/__fpending.c
index 0769f23..63fb7d7 100644 (file)
--- a/lib/__fpending.c
+++ b/lib/__fpending.c
@@ -17,7 +17,7 @@
 
 /* Written by Jim Meyering. */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/__fpending.h b/lib/__fpending.h
index 5a51582..36a842e 100644 (file)
--- a/lib/__fpending.h
+++ b/lib/__fpending.h
@@ -1,7 +1,3 @@
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <stddef.h>
 #include <stdio.h>
 

diff --git a/lib/acl.c b/lib/acl.c
index 47b73bd..2935825 100644 (file)
--- a/lib/acl.c
+++ b/lib/acl.c
@@ -18,7 +18,7 @@
 
    Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/argmatch.c b/lib/argmatch.c
index db883ac..36d5845 100644 (file)
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -20,7 +20,7 @@
 /* Written by David MacKenzie <djm@ai.mit.edu>
    Modified by Akim Demaille <demaille@inf.enst.fr> */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/argp-help.c b/lib/argp-help.c
index f5172d0..74c8fd8 100644 (file)
--- a/lib/argp-help.c
+++ b/lib/argp-help.c
@@ -22,7 +22,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <alloca.h>

diff --git a/lib/argp-parse.c b/lib/argp-parse.c
index 345bdda..b5d2096 100644 (file)
--- a/lib/argp-parse.c
+++ b/lib/argp-parse.c
@@ -18,7 +18,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <alloca.h>

diff --git a/lib/argp-pvh.c b/lib/argp-pvh.c
index 72a7484..6bf7c49 100644 (file)
--- a/lib/argp-pvh.c
+++ b/lib/argp-pvh.c
@@ -18,7 +18,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "argp.h"

diff --git a/lib/atexit.c b/lib/atexit.c
index a401b2f..f4873c9 100644 (file)
--- a/lib/atexit.c
+++ b/lib/atexit.c
@@ -1,7 +1,9 @@
 /* Wrapper to implement ANSI C's atexit using SunOS's on_exit. */
 /* This function is in the public domain.  --Mike Stump. */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 int
 atexit (void (*f) (void))

diff --git a/lib/backupfile.c b/lib/backupfile.c
index f48a1cd..ae61cbd 100644 (file)
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -21,7 +21,7 @@
 /* Written by Paul Eggert and David MacKenzie.
    Some algorithms adapted from GNU Emacs.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/basename.c b/lib/basename.c
index 00adc00..5cc97cd 100644 (file)
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/c-stack.c b/lib/c-stack.c
index d6e5f60..32088f9 100644 (file)
--- a/lib/c-stack.c
+++ b/lib/c-stack.c
@@ -34,7 +34,7 @@
 
    No attempt has been made to deal with multithreaded applications.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/calloc.c b/lib/calloc.c
index 9edbf45..317b4ff 100644 (file)
--- a/lib/calloc.c
+++ b/lib/calloc.c
@@ -18,7 +18,7 @@
 
 /* written by Jim Meyering */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #undef calloc

diff --git a/lib/chdir-long.c b/lib/chdir-long.c
index 2cc70fa..a727817 100644 (file)
--- a/lib/chdir-long.c
+++ b/lib/chdir-long.c
@@ -17,7 +17,9 @@
 
 /* written by Jim Meyering */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include "chdir-long.h"
 

diff --git a/lib/check-version.c b/lib/check-version.c
index 2f17a6c..4df90a4 100644 (file)
--- a/lib/check-version.c
+++ b/lib/check-version.c
@@ -20,8 +20,8 @@
    gcry_check_version from Werner Koch's Libgcrypt.  Paul Eggert
    suggested the use of strverscmp to simplify implementation. */
 
-#if HAVE_CONFIG_H
-# include "config.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #include <stddef.h>

diff --git a/lib/chown.c b/lib/chown.c
index 2d97902..86dd371 100644 (file)
--- a/lib/chown.c
+++ b/lib/chown.c
@@ -18,7 +18,9 @@
 
 /* written by Jim Meyering */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 /* Disable the definition of chown to rpl_chown (from config.h) in this
    file.  Otherwise, we'd get conflicting prototypes for rpl_chown on

diff --git a/lib/cloexec.c b/lib/cloexec.c
index 79d4ed0..5a09865 100644 (file)
--- a/lib/cloexec.c
+++ b/lib/cloexec.c
@@ -17,7 +17,7 @@
 
    The code is taken from glibc/manual/llio.texi  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/closeout.c b/lib/closeout.c
index fb7d2bb..5d0509d 100644 (file)
--- a/lib/closeout.c
+++ b/lib/closeout.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/copy-file.c b/lib/copy-file.c
index 4b21eff..8befdfe 100644 (file)
--- a/lib/copy-file.c
+++ b/lib/copy-file.c
@@ -18,7 +18,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /* Specification.  */

diff --git a/lib/creat-safer.c b/lib/creat-safer.c
index 8241c69..4588de3 100644 (file)
--- a/lib/creat-safer.c
+++ b/lib/creat-safer.c
@@ -17,7 +17,7 @@
 
 /* Written by Jim Meyering.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/cycle-check.c b/lib/cycle-check.c
index 1c6e17c..401dd86 100644 (file)
--- a/lib/cycle-check.c
+++ b/lib/cycle-check.c
@@ -19,7 +19,7 @@
 
 /* Written by Jim Meyering */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/dirfd.c b/lib/dirfd.c
index d65a35c..18d5e1e 100644 (file)
--- a/lib/dirfd.c
+++ b/lib/dirfd.c
@@ -17,7 +17,7 @@
 
 /* Written by Jim Meyering. */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/dirfd.h b/lib/dirfd.h
index ce5ab29..1223b51 100644 (file)
--- a/lib/dirfd.h
+++ b/lib/dirfd.h
@@ -17,10 +17,6 @@
 
    Written by Jim Meyering.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <sys/types.h>
 
 #if HAVE_DIRENT_H

diff --git a/lib/dirname.c b/lib/dirname.c
index f1930c8..e2b9d64 100644 (file)
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/dup-safer.c b/lib/dup-safer.c
index 1c46b6e..8cbee70 100644 (file)
--- a/lib/dup-safer.c
+++ b/lib/dup-safer.c
@@ -17,7 +17,7 @@
 
 /* Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/dup2.c b/lib/dup2.c
index 77deaf6..d934da1 100644 (file)
--- a/lib/dup2.c
+++ b/lib/dup2.c
@@ -17,7 +17,7 @@
 
 /* written by Paul Eggert */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/euidaccess.c b/lib/euidaccess.c
index 4bb93aa..15ffdb0 100644 (file)
--- a/lib/euidaccess.c
+++ b/lib/euidaccess.c
@@ -22,7 +22,7 @@
 /* Written by David MacKenzie and Torbjorn Granlund.
    Adapted for GNU C library by Roland McGrath.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/exclude.c b/lib/exclude.c
index 955c289..40dd8b5 100644 (file)
--- a/lib/exclude.c
+++ b/lib/exclude.c
@@ -20,7 +20,7 @@
 
 /* Written by Paul Eggert <eggert@twinsun.com>  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/exitfail.c b/lib/exitfail.c
index 1c5997b..27d38c3 100644 (file)
--- a/lib/exitfail.c
+++ b/lib/exitfail.c
@@ -17,7 +17,7 @@
    If not, write to the Free Software Foundation,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
index 3f07294..5bd7572 100644 (file)
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.c
@@ -18,7 +18,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /* Specification.  */

diff --git a/lib/fchown-stub.c b/lib/fchown-stub.c
index beb336c..322bacc 100644 (file)
--- a/lib/fchown-stub.c
+++ b/lib/fchown-stub.c
@@ -1,4 +1,6 @@
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include <sys/types.h>
 #include <errno.h>
 

diff --git a/lib/fd-safer.c b/lib/fd-safer.c
index 6b50451..5933bcb 100644 (file)
--- a/lib/fd-safer.c
+++ b/lib/fd-safer.c
@@ -18,7 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/file-type.c b/lib/file-type.c
index 0a6c3ee..4b81190 100644 (file)
--- a/lib/file-type.c
+++ b/lib/file-type.c
@@ -19,7 +19,7 @@
 
 /* Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/fileblocks.c b/lib/fileblocks.c
index dd6fb6d..8d4f41c 100644 (file)
--- a/lib/fileblocks.c
+++ b/lib/fileblocks.c
@@ -18,7 +18,7 @@
 
 /* Written by Brian L. Matthews, blm@6sceng.UUCP. */
 \f
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/filemode.c b/lib/filemode.c
index a5485b4..08b9b13 100644 (file)
--- a/lib/filemode.c
+++ b/lib/filemode.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/filenamecat.c b/lib/filenamecat.c
index f56697a..f947346 100644 (file)
--- a/lib/filenamecat.c
+++ b/lib/filenamecat.c
@@ -19,7 +19,7 @@
 
 /* Written by Jim Meyering.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/findprog.c b/lib/findprog.c
index 150056f..27eee3b 100644 (file)
--- a/lib/findprog.c
+++ b/lib/findprog.c
@@ -18,7 +18,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /* Specification.  */

diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index ad66ce8..06416f6 100644 (file)
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c
index ccaf121..4f2ffa1 100644 (file)
--- a/lib/fopen-safer.c
+++ b/lib/fopen-safer.c
@@ -17,7 +17,7 @@
 
 /* Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/free.c b/lib/free.c
index 9e34356..597088d 100644 (file)
--- a/lib/free.c
+++ b/lib/free.c
@@ -18,7 +18,7 @@
 
 /* written by Paul Eggert */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #undef free

diff --git a/lib/fsusage.c b/lib/fsusage.c
index 83d26af..da66b1a 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/ftruncate.c b/lib/ftruncate.c
index c062fe8..d5e1add 100644 (file)
--- a/lib/ftruncate.c
+++ b/lib/ftruncate.c
@@ -1,7 +1,7 @@
 /* ftruncate emulations that work on some System V's.
    This file is in the public domain.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/full-write.c b/lib/full-write.c
index 9626027..106f3c7 100644 (file)
--- a/lib/full-write.c
+++ b/lib/full-write.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/fwriteerror.c b/lib/fwriteerror.c
index 6ffdf52..a88c8e1 100644 (file)
--- a/lib/fwriteerror.c
+++ b/lib/fwriteerror.c
@@ -16,7 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c
index e74aa75..cd90769 100644 (file)
--- a/lib/getaddrinfo.c
+++ b/lib/getaddrinfo.c
@@ -16,7 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/getcwd.c b/lib/getcwd.c
index 86070ea..9f8c4cc 100644 (file)
--- a/lib/getcwd.c
+++ b/lib/getcwd.c
@@ -17,7 +17,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #if !_LIBC

diff --git a/lib/getdate.h b/lib/getdate.h
index dd97807..4694cdb 100644 (file)
--- a/lib/getdate.h
+++ b/lib/getdate.h
@@ -16,10 +16,6 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <stdbool.h>
 #include "timespec.h"
 

diff --git a/lib/getdelim.c b/lib/getdelim.c
index 5dc4a38..8498b75 100644 (file)
--- a/lib/getdelim.c
+++ b/lib/getdelim.c
@@ -19,7 +19,7 @@
 
 /* Ported from glibc by Simon Josefsson. */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/getgroups.c b/lib/getgroups.c
index 084d1f8..126f130 100644 (file)
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -17,7 +17,9 @@
 
 /* written by Jim Meyering */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include <stdio.h>
 #include <sys/types.h>
 #include <errno.h>

diff --git a/lib/getline.c b/lib/getline.c
index 00f02f4..ab054fb 100644 (file)
--- a/lib/getline.c
+++ b/lib/getline.c
@@ -18,7 +18,7 @@
 
 /* Written by Simon Josefsson. */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/getlogin_r.c b/lib/getlogin_r.c
index d269b92..b9b76c6 100644 (file)
--- a/lib/getlogin_r.c
+++ b/lib/getlogin_r.c
@@ -18,7 +18,7 @@
 
 /* written by Paul Eggert and Derek Price */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/getndelim2.c b/lib/getndelim2.c
index e9f8cb9..3c0fa3f 100644 (file)
--- a/lib/getndelim2.c
+++ b/lib/getndelim2.c
@@ -20,7 +20,7 @@
 
 /* Originally written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/getnline.c b/lib/getnline.c
index cabc1d5..c8cd38c 100644 (file)
--- a/lib/getnline.c
+++ b/lib/getnline.c
@@ -16,7 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/getopt1.c b/lib/getopt1.c
index 5acd224..25d7926 100644 (file)
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -18,7 +18,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 \f
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #ifdef _LIBC

diff --git a/lib/getpass.c b/lib/getpass.c
index b965bcf..f0b3184 100644 (file)
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -15,7 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index f9afc22..eb6de94 100644 (file)
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -20,7 +20,9 @@
 
 /* written by Jim Meyering */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 /* Disable the definitions of these functions (from config.h)
    so we can use the library versions here.  */

diff --git a/lib/group-member.c b/lib/group-member.c
index 67fb9fd..09a9ffc 100644 (file)
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/hard-locale.c b/lib/hard-locale.c
index b0566ec..98530fc 100644 (file)
--- a/lib/hard-locale.c
+++ b/lib/hard-locale.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/hash-pjw.c b/lib/hash-pjw.c
index 76b4db5..315277a 100644 (file)
--- a/lib/hash-pjw.c
+++ b/lib/hash-pjw.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/hash.c b/lib/hash.c
index 2b5d5c2..f85bd51 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -24,7 +24,7 @@
 /* Define USE_OBSTACK to 1 if you want the allocator to use obstacks instead
    of malloc.  If you change USE_OBSTACK, you have to recompile!  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/human.c b/lib/human.c
index 282a323..ed15c6a 100644 (file)
--- a/lib/human.c
+++ b/lib/human.c
@@ -19,7 +19,7 @@
 
 /* Written by Paul Eggert and Larry McVoy.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/human.h b/lib/human.h
index 3b23c12..20956ab 100644 (file)
--- a/lib/human.h
+++ b/lib/human.h
@@ -22,10 +22,6 @@
 #ifndef HUMAN_H_
 # define HUMAN_H_ 1
 
-# if HAVE_CONFIG_H
-#  include <config.h>
-# endif
-
 # include <limits.h>
 # include <stdbool.h>
 

diff --git a/lib/idcache.c b/lib/idcache.c
index 82dec8d..b559e47 100644 (file)
--- a/lib/idcache.c
+++ b/lib/idcache.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c
index c5d2eb0..752f063 100644 (file)
--- a/lib/inet_ntop.c
+++ b/lib/inet_ntop.c
@@ -16,7 +16,7 @@
  * SOFTWARE.
  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/inttostr.c b/lib/inttostr.c
index 23748a1..2adcd2c 100644 (file)
--- a/lib/inttostr.c
+++ b/lib/inttostr.c
@@ -18,6 +18,9 @@
 
 /* Written by Paul Eggert */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "inttostr.h"
 
 /* Convert I to a printable string in BUF, which must be at least

diff --git a/lib/inttostr.h b/lib/inttostr.h
index 952da97..a036a1b 100644 (file)
--- a/lib/inttostr.h
+++ b/lib/inttostr.h
@@ -18,10 +18,6 @@
 
 /* Written by Paul Eggert */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif

diff --git a/lib/isdir.c b/lib/isdir.c
index 11fe426..6a56a43 100644 (file)
--- a/lib/isdir.c
+++ b/lib/isdir.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/lchown.c b/lib/lchown.c
index ff5679e..0b74eac 100644 (file)
--- a/lib/lchown.c
+++ b/lib/lchown.c
@@ -17,7 +17,9 @@
 
 /* written by Jim Meyering */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/lib/long-options.c b/lib/long-options.c
index 33f1d46..7c9972a 100644 (file)
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -19,7 +19,7 @@
 
 /* Written by Jim Meyering.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/lstat.c b/lib/lstat.c
index 0d539fe..f5a22b0 100644 (file)
--- a/lib/lstat.c
+++ b/lib/lstat.c
@@ -19,7 +19,9 @@
 
 /* written by Jim Meyering */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 /* The specification of these functions is in sys_stat.h.  But we cannot
    include this include file here, because on some systems, a

diff --git a/lib/malloc.c b/lib/malloc.c
index a75da9b..58fa611 100644 (file)
--- a/lib/malloc.c
+++ b/lib/malloc.c
@@ -17,7 +17,7 @@
 
 /* written by Jim Meyering */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #undef malloc

diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c
index 00519f5..b0a4925 100644 (file)
--- a/lib/memcasecmp.c
+++ b/lib/memcasecmp.c
@@ -17,7 +17,7 @@
 
 /* Written by Jim Meyering.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/memcmp.c b/lib/memcmp.c
index ca68658..6928b1e 100644 (file)
--- a/lib/memcmp.c
+++ b/lib/memcmp.c
@@ -22,7 +22,7 @@
    USA.  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <string.h>

diff --git a/lib/memcoll.c b/lib/memcoll.c
index d9504b4..82d889f 100644 (file)
--- a/lib/memcoll.c
+++ b/lib/memcoll.c
@@ -17,7 +17,7 @@
 
 /* Contributed by Paul Eggert <eggert@twinsun.com>.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/memcpy.c b/lib/memcpy.c
index 09fb55d..2ab5ed6 100644 (file)
--- a/lib/memcpy.c
+++ b/lib/memcpy.c
@@ -16,7 +16,7 @@
 
 /* Written by Jim Meyering <meyering@na-net.ornl.gov>.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/memmove.c b/lib/memmove.c
index 79cc782..753c899 100644 (file)
--- a/lib/memmove.c
+++ b/lib/memmove.c
@@ -3,7 +3,7 @@
    In the public domain.
    By David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/mkdir-p.c b/lib/mkdir-p.c
index 4bad686..efaa8d2 100644 (file)
--- a/lib/mkdir-p.c
+++ b/lib/mkdir-p.c
@@ -19,7 +19,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> and Jim Meyering.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/mkdir.c b/lib/mkdir.c
index 807f322..c921ecf 100644 (file)
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -19,7 +19,9 @@
 
 /* written by Jim Meyering */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 /* Disable the definition of mkdir to rpl_mkdir (from config.h) in this
    file.  Otherwise, we'd get conflicting prototypes for rpl_mkdir on

diff --git a/lib/mkstemp.c b/lib/mkstemp.c
index 2683e4b..cec5ba8 100644 (file)
--- a/lib/mkstemp.c
+++ b/lib/mkstemp.c
@@ -15,7 +15,9 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 /* Disable the definition of mkstemp to rpl_mkstemp (from config.h) in this
    file.  Otherwise, we'd get conflicting prototypes for rpl_mkstemp on

diff --git a/lib/modechange.c b/lib/modechange.c
index a2697f6..6ab9cb6 100644 (file)
--- a/lib/modechange.c
+++ b/lib/modechange.c
@@ -26,7 +26,7 @@
    changing the mode of many files, this probably results in a
    performance gain.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/mountlist.c b/lib/mountlist.c
index a8ef87d..325b213 100644 (file)
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/nanosleep.c b/lib/nanosleep.c
index f41aed2..fa20785 100644 (file)
--- a/lib/nanosleep.c
+++ b/lib/nanosleep.c
@@ -17,7 +17,9 @@
 
 /* written by Jim Meyering */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 /* Undefine nanosleep here so any prototype is not redefined to be a
    prototype for rpl_nanosleep. (they'd conflict e.g., on alpha-dec-osf3.2)  */

diff --git a/lib/open-safer.c b/lib/open-safer.c
index c7800a3..d3ba894 100644 (file)
--- a/lib/open-safer.c
+++ b/lib/open-safer.c
@@ -17,7 +17,7 @@
 
 /* Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/openat.c b/lib/openat.c
index ec51b2d..443cb3d 100644 (file)
--- a/lib/openat.c
+++ b/lib/openat.c
@@ -17,7 +17,9 @@
 
 /* written by Jim Meyering */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include "openat.h"
 

diff --git a/lib/physmem.c b/lib/physmem.c
index dabb00c..795a0a8 100644 (file)
--- a/lib/physmem.c
+++ b/lib/physmem.c
@@ -17,7 +17,7 @@
 
 /* Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/pipe-safer.c b/lib/pipe-safer.c
index 5791657..fb02d72 100644 (file)
--- a/lib/pipe-safer.c
+++ b/lib/pipe-safer.c
@@ -17,7 +17,7 @@
 
 /* Written by Jim Meyering.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/pipe.c b/lib/pipe.c
index 5ad2935..730a155 100644 (file)
--- a/lib/pipe.c
+++ b/lib/pipe.c
@@ -18,7 +18,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /* Specification.  */

diff --git a/lib/poll.c b/lib/poll.c
index bc200f5..8070885 100644 (file)
--- a/lib/poll.c
+++ b/lib/poll.c
@@ -20,7 +20,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #include <sys/types.h>

diff --git a/lib/posixver.c b/lib/posixver.c
index 2fa097a..3a0bb52 100644 (file)
--- a/lib/posixver.c
+++ b/lib/posixver.c
@@ -18,7 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/progname.c b/lib/progname.c
index ea32128..67ecdff 100644 (file)
--- a/lib/progname.c
+++ b/lib/progname.c
@@ -18,7 +18,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /* Specification.  */

diff --git a/lib/progreloc.c b/lib/progreloc.c
index df88d5a..18e7359 100644 (file)
--- a/lib/progreloc.c
+++ b/lib/progreloc.c
@@ -18,7 +18,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /* Specification.  */

diff --git a/lib/putenv.c b/lib/putenv.c
index 69fb90b..6acefaa 100644 (file)
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/quote.c b/lib/quote.c
index 4c75029..16cc939 100644 (file)
--- a/lib/quote.c
+++ b/lib/quote.c
@@ -17,7 +17,7 @@
 
 /* Written by Paul Eggert <eggert@twinsun.com> */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/quotearg.c b/lib/quotearg.c
index eef237f..13bd16f 100644 (file)
--- a/lib/quotearg.c
+++ b/lib/quotearg.c
@@ -19,7 +19,7 @@
 
 /* Written by Paul Eggert <eggert@twinsun.com> */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/raise.c b/lib/raise.c
index 8eeea5c..237d8bf 100644 (file)
--- a/lib/raise.c
+++ b/lib/raise.c
@@ -17,7 +17,9 @@
 
 /* written by Jim Meyering */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <signal.h>

diff --git a/lib/readline.c b/lib/readline.c
index 197262a..3f8c18a 100644 (file)
--- a/lib/readline.c
+++ b/lib/readline.c
@@ -16,8 +16,8 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 /* This module is intended to be used when the application only need

diff --git a/lib/readlink.c b/lib/readlink.c
index bf8a5f7..3196aec 100644 (file)
--- a/lib/readlink.c
+++ b/lib/readlink.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/readtokens0.c b/lib/readtokens0.c
index 494e08d..55b39a7 100644 (file)
--- a/lib/readtokens0.c
+++ b/lib/readtokens0.c
@@ -17,7 +17,9 @@
 
    Written by Jim Meyering. */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include <stdlib.h>
 
 #include "readtokens0.h"

diff --git a/lib/readutmp.c b/lib/readutmp.c
index 846ab3c..634d9ab 100644 (file)
--- a/lib/readutmp.c
+++ b/lib/readutmp.c
@@ -17,7 +17,9 @@
 
 /* Written by jla; revised by djm */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include "readutmp.h"
 

diff --git a/lib/realloc.c b/lib/realloc.c
index df570aa..fe94822 100644 (file)
--- a/lib/realloc.c
+++ b/lib/realloc.c
@@ -17,7 +17,7 @@
 
 /* written by Jim Meyering */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #undef realloc

diff --git a/lib/regex.c b/lib/regex.c
index 1bfdd6b..82e76c0 100644 (file)
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -18,7 +18,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
 #endif
 
 #ifdef _LIBC

diff --git a/lib/rename.c b/lib/rename.c
index 6f77fd0..9c9e7f4 100644 (file)
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -19,7 +19,7 @@
 
 /* written by Volker Borchert */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #undef rename

diff --git a/lib/rmdir.c b/lib/rmdir.c
index ad026a6..25564b6 100644 (file)
--- a/lib/rmdir.c
+++ b/lib/rmdir.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index 3e3a38e..ba8bc4c 100644 (file)
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -16,7 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/safe-read.c b/lib/safe-read.c
index 904fc71..391d789 100644 (file)
--- a/lib/safe-read.c
+++ b/lib/safe-read.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/same.c b/lib/same.c
index 89ee47d..f9e707d 100644 (file)
--- a/lib/same.c
+++ b/lib/same.c
@@ -19,7 +19,7 @@
 
 /* written by Jim Meyering */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/save-cwd.c b/lib/save-cwd.c
index 5ad790a..7f1b30b 100644 (file)
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -19,8 +19,8 @@
 
 /* Written by Jim Meyering.  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #include "save-cwd.h"

diff --git a/lib/savedir.c b/lib/savedir.c
index 4eeda01..a2cf2f6 100644 (file)
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -19,7 +19,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/sig2str.c b/lib/sig2str.c
index 25ea5f3..00089be 100644 (file)
--- a/lib/sig2str.c
+++ b/lib/sig2str.c
@@ -18,7 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/strcspn.c b/lib/strcspn.c
index 7f60620..9fbc5de 100644 (file)
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/strerror.c b/lib/strerror.c
index 1efb53f..623821d 100644 (file)
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/stripslash.c b/lib/stripslash.c
index 870a66f..9b55da4 100644 (file)
--- a/lib/stripslash.c
+++ b/lib/stripslash.c
@@ -16,7 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/strncasecmp.c b/lib/strncasecmp.c
index 4e57deb..72ead01 100644 (file)
--- a/lib/strncasecmp.c
+++ b/lib/strncasecmp.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/strndup.c b/lib/strndup.c
index b2d7c0e..9ac2756 100644 (file)
--- a/lib/strndup.c
+++ b/lib/strndup.c
@@ -18,7 +18,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>

diff --git a/lib/strnlen.c b/lib/strnlen.c
index 642c66f..97a1f81 100644 (file)
--- a/lib/strnlen.c
+++ b/lib/strnlen.c
@@ -16,7 +16,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #undef strnlen

diff --git a/lib/strnlen1.c b/lib/strnlen1.c
index 6cc2da8..f3338e7 100644 (file)
--- a/lib/strnlen1.c
+++ b/lib/strnlen1.c
@@ -16,7 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/strsep.c b/lib/strsep.c
index 40c2939..db2b074 100644 (file)
--- a/lib/strsep.c
+++ b/lib/strsep.c
@@ -17,7 +17,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 /* Specification.  */

diff --git a/lib/strstr.c b/lib/strstr.c
index 496e19b..e94cef7 100644 (file)
--- a/lib/strstr.c
+++ b/lib/strstr.c
@@ -16,7 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/strtod.c b/lib/strtod.c
index 79a82f2..7b48754 100644 (file)
--- a/lib/strtod.c
+++ b/lib/strtod.c
@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index 4724195..43a690d 100644 (file)
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -19,7 +19,7 @@
 
 /* Written by Paul Eggert. */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/strtol.c b/lib/strtol.c
index 7788981..9bfbe3c 100644 (file)
--- a/lib/strtol.c
+++ b/lib/strtol.c
@@ -20,7 +20,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/strverscmp.c b/lib/strverscmp.c
index 900c637..6276bca 100644 (file)
--- a/lib/strverscmp.c
+++ b/lib/strverscmp.c
@@ -17,7 +17,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/tempname.c b/lib/tempname.c
index 4b0fad3..cae42e1 100644 (file)
--- a/lib/tempname.c
+++ b/lib/tempname.c
@@ -17,7 +17,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/time_r.c b/lib/time_r.c
index 1298728..245ac92 100644 (file)
--- a/lib/time_r.c
+++ b/lib/time_r.c
@@ -18,7 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/timespec.h b/lib/timespec.h
index 01032f3..8188c20 100644 (file)
--- a/lib/timespec.h
+++ b/lib/timespec.h
@@ -19,8 +19,6 @@
 #if ! defined TIMESPEC_H
 # define TIMESPEC_H
 
-/* You must include config.h before including this file.  */
-
 # include <sys/types.h>
 # if TIME_WITH_SYS_TIME
 #  include <sys/time.h>

diff --git a/lib/unlinkdir.c b/lib/unlinkdir.c
index b12d2a4..91a4fb6 100644 (file)
--- a/lib/unlinkdir.c
+++ b/lib/unlinkdir.c
@@ -18,7 +18,9 @@
 
 /* Written by Paul Eggert and Jim Meyering.  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include "unlinkdir.h"
 

diff --git a/lib/userspec.c b/lib/userspec.c
index 5f5c5bf..5488c31 100644 (file)
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -18,7 +18,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/utimecmp.c b/lib/utimecmp.c
index 4c8e6c9..7308929 100644 (file)
--- a/lib/utimecmp.c
+++ b/lib/utimecmp.c
@@ -18,7 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/version-etc-fsf.c b/lib/version-etc-fsf.c
index a91ab86..3741005 100644 (file)
--- a/lib/version-etc-fsf.c
+++ b/lib/version-etc-fsf.c
@@ -17,7 +17,7 @@
 
 /* Written by Jim Meyering. */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/version-etc.c b/lib/version-etc.c
index f27f6a4..05bc3ad 100644 (file)
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -17,7 +17,7 @@
 
 /* Written by Jim Meyering. */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/wait-process.c b/lib/wait-process.c
index b36af18..221a39c 100644 (file)
--- a/lib/wait-process.c
+++ b/lib/wait-process.c
@@ -18,7 +18,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /* Specification.  */

diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c
index 637933e..ff5ac9e 100644 (file)
--- a/lib/xalloc-die.c
+++ b/lib/xalloc-die.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c
index f8116f2..0f798da 100644 (file)
--- a/lib/xgetcwd.c
+++ b/lib/xgetcwd.c
@@ -18,7 +18,7 @@
 
 /* Written by Jim Meyering.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 6977703..687633c 100644 (file)
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c
index 063612e..f04e468 100644 (file)
--- a/lib/xmemcoll.c
+++ b/lib/xmemcoll.c
@@ -17,7 +17,7 @@
 
 /* Contributed by Paul Eggert <eggert@twinsun.com>.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/xnanosleep.c b/lib/xnanosleep.c
index f2d9e93..bab58ee 100644 (file)
--- a/lib/xnanosleep.c
+++ b/lib/xnanosleep.c
@@ -18,7 +18,7 @@
 /* Mostly written (for sleep.c) by Paul Eggert.
    Factored out (creating this file) by Jim Meyering.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/xreadlink.c b/lib/xreadlink.c
index d56d2a6..f21812d 100644 (file)
--- a/lib/xreadlink.c
+++ b/lib/xreadlink.c
@@ -19,7 +19,7 @@
 
 /* Written by Jim Meyering <jim@meyering.net>  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/xsetenv.c b/lib/xsetenv.c
index 3e59386..0483373 100644 (file)
--- a/lib/xsetenv.c
+++ b/lib/xsetenv.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/xstrndup.c b/lib/xstrndup.c
index edf83cf..a62d4bd 100644 (file)
--- a/lib/xstrndup.c
+++ b/lib/xstrndup.c
@@ -16,7 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/xstrtoimax.c b/lib/xstrtoimax.c
index b1bc361..3e585d6 100644 (file)
--- a/lib/xstrtoimax.c
+++ b/lib/xstrtoimax.c
@@ -17,7 +17,7 @@
 
 /* Cloned by Jim Meyering. */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index 9940fc7..d01db3c 100644 (file)
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -19,7 +19,7 @@
 
 /* Written by Jim Meyering. */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/xstrtoumax.c b/lib/xstrtoumax.c
index d7cf2be..e6208a4 100644 (file)
--- a/lib/xstrtoumax.c
+++ b/lib/xstrtoumax.c
@@ -17,7 +17,7 @@
 
 /* Written by Paul Eggert. */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/lib/yesno.c b/lib/yesno.c
index e4b9458..a364a1b 100644 (file)
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif