From 222b0486b7db1b09293e05512873d633440efcb3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 19 Sep 2005 17:28:14 +0000 Subject: [PATCH] Use a consistent style for including . * __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. --- lib/ChangeLog | 39 +++++++++++++++++++++++++++++++++++++++ lib/__fpending.c | 2 +- lib/__fpending.h | 4 ---- lib/acl.c | 2 +- lib/argmatch.c | 2 +- lib/argp-help.c | 2 +- lib/argp-parse.c | 2 +- lib/argp-pvh.c | 2 +- lib/atexit.c | 4 +++- lib/backupfile.c | 2 +- lib/basename.c | 2 +- lib/c-stack.c | 2 +- lib/calloc.c | 2 +- lib/chdir-long.c | 4 +++- lib/check-version.c | 4 ++-- lib/chown.c | 4 +++- lib/cloexec.c | 2 +- lib/closeout.c | 2 +- lib/copy-file.c | 2 +- lib/creat-safer.c | 2 +- lib/cycle-check.c | 2 +- lib/dirfd.c | 2 +- lib/dirfd.h | 4 ---- lib/dirname.c | 2 +- lib/dup-safer.c | 2 +- lib/dup2.c | 2 +- lib/euidaccess.c | 2 +- lib/exclude.c | 2 +- lib/exitfail.c | 2 +- lib/fatal-signal.c | 2 +- lib/fchown-stub.c | 4 +++- lib/fd-safer.c | 2 +- lib/file-type.c | 2 +- lib/fileblocks.c | 2 +- lib/filemode.c | 2 +- lib/filenamecat.c | 2 +- lib/findprog.c | 2 +- lib/fnmatch.c | 2 +- lib/fopen-safer.c | 2 +- lib/free.c | 2 +- lib/fsusage.c | 2 +- lib/ftruncate.c | 2 +- lib/full-write.c | 2 +- lib/fwriteerror.c | 2 +- lib/getaddrinfo.c | 2 +- lib/getcwd.c | 2 +- lib/getdate.h | 4 ---- lib/getdelim.c | 2 +- lib/getgroups.c | 4 +++- lib/getline.c | 2 +- lib/getlogin_r.c | 2 +- lib/getndelim2.c | 2 +- lib/getnline.c | 2 +- lib/getopt1.c | 2 +- lib/getpass.c | 2 +- lib/gettimeofday.c | 4 +++- lib/group-member.c | 2 +- lib/hard-locale.c | 2 +- lib/hash-pjw.c | 2 +- lib/hash.c | 2 +- lib/human.c | 2 +- lib/human.h | 4 ---- lib/idcache.c | 2 +- lib/inet_ntop.c | 2 +- lib/inttostr.c | 3 +++ lib/inttostr.h | 4 ---- lib/isdir.c | 2 +- lib/lchown.c | 4 +++- lib/long-options.c | 2 +- lib/lstat.c | 4 +++- lib/malloc.c | 2 +- lib/memcasecmp.c | 2 +- lib/memcmp.c | 2 +- lib/memcoll.c | 2 +- lib/memcpy.c | 2 +- lib/memmove.c | 2 +- lib/mkdir-p.c | 2 +- lib/mkdir.c | 4 +++- lib/mkstemp.c | 4 +++- lib/modechange.c | 2 +- lib/mountlist.c | 2 +- lib/nanosleep.c | 4 +++- lib/open-safer.c | 2 +- lib/openat.c | 4 +++- lib/physmem.c | 2 +- lib/pipe-safer.c | 2 +- lib/pipe.c | 2 +- lib/poll.c | 2 +- lib/posixver.c | 2 +- lib/progname.c | 2 +- lib/progreloc.c | 2 +- lib/putenv.c | 2 +- lib/quote.c | 2 +- lib/quotearg.c | 2 +- lib/raise.c | 4 +++- lib/readline.c | 4 ++-- lib/readlink.c | 2 +- lib/readtokens0.c | 4 +++- lib/readutmp.c | 4 +++- lib/realloc.c | 2 +- lib/regex.c | 2 +- lib/rename.c | 2 +- lib/rmdir.c | 2 +- lib/rpmatch.c | 2 +- lib/safe-read.c | 2 +- lib/same.c | 2 +- lib/save-cwd.c | 4 ++-- lib/savedir.c | 2 +- lib/sig2str.c | 2 +- lib/strcspn.c | 2 +- lib/strerror.c | 2 +- lib/stripslash.c | 2 +- lib/strncasecmp.c | 2 +- lib/strndup.c | 2 +- lib/strnlen.c | 2 +- lib/strnlen1.c | 2 +- lib/strsep.c | 2 +- lib/strstr.c | 2 +- lib/strtod.c | 2 +- lib/strtoimax.c | 2 +- lib/strtol.c | 2 +- lib/strverscmp.c | 2 +- lib/tempname.c | 2 +- lib/time_r.c | 2 +- lib/timespec.h | 2 -- lib/unlinkdir.c | 4 +++- lib/userspec.c | 2 +- lib/utimecmp.c | 2 +- lib/version-etc-fsf.c | 2 +- lib/version-etc.c | 2 +- lib/wait-process.c | 2 +- lib/xalloc-die.c | 2 +- lib/xgetcwd.c | 2 +- lib/xmalloc.c | 2 +- lib/xmemcoll.c | 2 +- lib/xnanosleep.c | 2 +- lib/xreadlink.c | 2 +- lib/xsetenv.c | 2 +- lib/xstrndup.c | 2 +- lib/xstrtoimax.c | 2 +- lib/xstrtol.c | 2 +- lib/xstrtoumax.c | 2 +- lib/yesno.c | 2 +- 143 files changed, 212 insertions(+), 160 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 1786690b9..2c62bb568 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,42 @@ +2005-09-19 Ralf Wildenhues + + Use a consistent style for including . + * __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 * stat-time.h: New file. diff --git a/lib/__fpending.c b/lib/__fpending.c index 0769f2314..63fb7d7cc 100644 --- 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 #endif diff --git a/lib/__fpending.h b/lib/__fpending.h index 5a5158216..36a842ed5 100644 --- a/lib/__fpending.h +++ b/lib/__fpending.h @@ -1,7 +1,3 @@ -#if HAVE_CONFIG_H -# include -#endif - #include #include diff --git a/lib/acl.c b/lib/acl.c index 47b73bd23..293582514 100644 --- 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 #endif diff --git a/lib/argmatch.c b/lib/argmatch.c index db883ac41..36d5845ac 100644 --- a/lib/argmatch.c +++ b/lib/argmatch.c @@ -20,7 +20,7 @@ /* Written by David MacKenzie Modified by Akim Demaille */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/argp-help.c b/lib/argp-help.c index f5172d0a2..74c8fd862 100644 --- a/lib/argp-help.c +++ b/lib/argp-help.c @@ -22,7 +22,7 @@ #endif #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff --git a/lib/argp-parse.c b/lib/argp-parse.c index 345bddabe..b5d209665 100644 --- 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 +# include #endif #include diff --git a/lib/argp-pvh.c b/lib/argp-pvh.c index 72a74845d..6bf7c49b8 100644 --- 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 +# include #endif #include "argp.h" diff --git a/lib/atexit.c b/lib/atexit.c index a401b2ff8..f4873c9ee 100644 --- 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 +#endif int atexit (void (*f) (void)) diff --git a/lib/backupfile.c b/lib/backupfile.c index f48a1cde8..ae61cbd1b 100644 --- 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 #endif diff --git a/lib/basename.c b/lib/basename.c index 00adc0015..5cc97cd4a 100644 --- 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 #endif diff --git a/lib/c-stack.c b/lib/c-stack.c index d6e5f60aa..32088f9c6 100644 --- 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 #endif diff --git a/lib/calloc.c b/lib/calloc.c index 9edbf4552..317b4fff4 100644 --- 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 #endif #undef calloc diff --git a/lib/chdir-long.c b/lib/chdir-long.c index 2cc70fa53..a72781725 100644 --- a/lib/chdir-long.c +++ b/lib/chdir-long.c @@ -17,7 +17,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include "chdir-long.h" diff --git a/lib/check-version.c b/lib/check-version.c index 2f17a6ccd..4df90a484 100644 --- 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 #endif #include diff --git a/lib/chown.c b/lib/chown.c index 2d97902e6..86dd3717c 100644 --- a/lib/chown.c +++ b/lib/chown.c @@ -18,7 +18,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#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 79d4ed0b8..5a0986561 100644 --- 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 #endif diff --git a/lib/closeout.c b/lib/closeout.c index fb7d2bb42..5d0509ded 100644 --- 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 #endif diff --git a/lib/copy-file.c b/lib/copy-file.c index 4b21eff8e..8befdfe02 100644 --- a/lib/copy-file.c +++ b/lib/copy-file.c @@ -18,7 +18,7 @@ #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif /* Specification. */ diff --git a/lib/creat-safer.c b/lib/creat-safer.c index 8241c69b0..4588de399 100644 --- 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 #endif diff --git a/lib/cycle-check.c b/lib/cycle-check.c index 1c6e17cac..401dd862f 100644 --- 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 #endif diff --git a/lib/dirfd.c b/lib/dirfd.c index d65a35c3e..18d5e1e5d 100644 --- 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 #endif diff --git a/lib/dirfd.h b/lib/dirfd.h index ce5ab2903..1223b51d2 100644 --- a/lib/dirfd.h +++ b/lib/dirfd.h @@ -17,10 +17,6 @@ Written by Jim Meyering. */ -#if HAVE_CONFIG_H -# include -#endif - #include #if HAVE_DIRENT_H diff --git a/lib/dirname.c b/lib/dirname.c index f1930c8d2..e2b9d648c 100644 --- 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 #endif diff --git a/lib/dup-safer.c b/lib/dup-safer.c index 1c46b6e72..8cbee7007 100644 --- 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 #endif diff --git a/lib/dup2.c b/lib/dup2.c index 77deaf62d..d934da15d 100644 --- 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 #endif diff --git a/lib/euidaccess.c b/lib/euidaccess.c index 4bb93aa0b..15ffdb072 100644 --- 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 #endif diff --git a/lib/exclude.c b/lib/exclude.c index 955c28956..40dd8b572 100644 --- a/lib/exclude.c +++ b/lib/exclude.c @@ -20,7 +20,7 @@ /* Written by Paul Eggert */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/exitfail.c b/lib/exitfail.c index 1c5997b8a..27d38c32a 100644 --- 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 #endif diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c index 3f0729448..5bd757258 100644 --- a/lib/fatal-signal.c +++ b/lib/fatal-signal.c @@ -18,7 +18,7 @@ #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif /* Specification. */ diff --git a/lib/fchown-stub.c b/lib/fchown-stub.c index beb336caf..322baccce 100644 --- a/lib/fchown-stub.c +++ b/lib/fchown-stub.c @@ -1,4 +1,6 @@ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include #include diff --git a/lib/fd-safer.c b/lib/fd-safer.c index 6b5045133..5933bcbd1 100644 --- 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 #endif diff --git a/lib/file-type.c b/lib/file-type.c index 0a6c3ee77..4b811903f 100644 --- 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 #endif diff --git a/lib/fileblocks.c b/lib/fileblocks.c index dd6fb6d3a..8d4f41c24 100644 --- a/lib/fileblocks.c +++ b/lib/fileblocks.c @@ -18,7 +18,7 @@ /* Written by Brian L. Matthews, blm@6sceng.UUCP. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/filemode.c b/lib/filemode.c index a5485b401..08b9b13bb 100644 --- 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 #endif diff --git a/lib/filenamecat.c b/lib/filenamecat.c index f56697a6d..f94734630 100644 --- 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 #endif diff --git a/lib/findprog.c b/lib/findprog.c index 150056f33..27eee3ba6 100644 --- a/lib/findprog.c +++ b/lib/findprog.c @@ -18,7 +18,7 @@ #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif /* Specification. */ diff --git a/lib/fnmatch.c b/lib/fnmatch.c index ad66ce89e..06416f6ee 100644 --- 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 #endif diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c index ccaf1219f..4f2ffa1b8 100644 --- 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 #endif diff --git a/lib/free.c b/lib/free.c index 9e3435640..597088d4e 100644 --- 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 #endif #undef free diff --git a/lib/fsusage.c b/lib/fsusage.c index 83d26af88..da66b1a0f 100644 --- 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 #endif diff --git a/lib/ftruncate.c b/lib/ftruncate.c index c062fe80d..d5e1addfc 100644 --- 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 #endif diff --git a/lib/full-write.c b/lib/full-write.c index 962602742..106f3c7e5 100644 --- 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 #endif diff --git a/lib/fwriteerror.c b/lib/fwriteerror.c index 6ffdf526d..a88c8e1c3 100644 --- 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 #endif diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c index e74aa75eb..cd90769da 100644 --- 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 #endif diff --git a/lib/getcwd.c b/lib/getcwd.c index 86070ead8..9f8c4cc3f 100644 --- 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 #endif #if !_LIBC diff --git a/lib/getdate.h b/lib/getdate.h index dd97807a7..4694cdb66 100644 --- 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 -#endif - #include #include "timespec.h" diff --git a/lib/getdelim.c b/lib/getdelim.c index 5dc4a38d2..8498b7556 100644 --- 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 #endif diff --git a/lib/getgroups.c b/lib/getgroups.c index 084d1f828..126f130a0 100644 --- a/lib/getgroups.c +++ b/lib/getgroups.c @@ -17,7 +17,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include #include #include diff --git a/lib/getline.c b/lib/getline.c index 00f02f4ae..ab054fba6 100644 --- 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 #endif diff --git a/lib/getlogin_r.c b/lib/getlogin_r.c index d269b9223..b9b76c64b 100644 --- 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 #endif diff --git a/lib/getndelim2.c b/lib/getndelim2.c index e9f8cb9c5..3c0fa3f05 100644 --- 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 #endif diff --git a/lib/getnline.c b/lib/getnline.c index cabc1d550..c8cd38c0e 100644 --- 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 #endif diff --git a/lib/getopt1.c b/lib/getopt1.c index 5acd2245a..25d792650 100644 --- a/lib/getopt1.c +++ b/lib/getopt1.c @@ -18,7 +18,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H -#include +# include #endif #ifdef _LIBC diff --git a/lib/getpass.c b/lib/getpass.c index b965bcfc0..f0b3184ee 100644 --- 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 #endif diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c index f9afc22c1..eb6de94f1 100644 --- a/lib/gettimeofday.c +++ b/lib/gettimeofday.c @@ -20,7 +20,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#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 67fb9fd7c..09a9ffc78 100644 --- 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 #endif diff --git a/lib/hard-locale.c b/lib/hard-locale.c index b0566ec21..98530fcd5 100644 --- 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 #endif diff --git a/lib/hash-pjw.c b/lib/hash-pjw.c index 76b4db5c7..315277abb 100644 --- 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 #endif diff --git a/lib/hash.c b/lib/hash.c index 2b5d5c255..f85bd519b 100644 --- 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 #endif diff --git a/lib/human.c b/lib/human.c index 282a3236f..ed15c6a24 100644 --- 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 #endif diff --git a/lib/human.h b/lib/human.h index 3b23c123b..20956ab39 100644 --- a/lib/human.h +++ b/lib/human.h @@ -22,10 +22,6 @@ #ifndef HUMAN_H_ # define HUMAN_H_ 1 -# if HAVE_CONFIG_H -# include -# endif - # include # include diff --git a/lib/idcache.c b/lib/idcache.c index 82dec8d90..b559e474c 100644 --- 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 #endif diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c index c5d2eb003..752f06387 100644 --- a/lib/inet_ntop.c +++ b/lib/inet_ntop.c @@ -16,7 +16,7 @@ * SOFTWARE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/inttostr.c b/lib/inttostr.c index 23748a137..2adcd2c13 100644 --- a/lib/inttostr.c +++ b/lib/inttostr.c @@ -18,6 +18,9 @@ /* Written by Paul Eggert */ +#ifdef HAVE_CONFIG_H +# include +#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 952da97b6..a036a1b7f 100644 --- a/lib/inttostr.h +++ b/lib/inttostr.h @@ -18,10 +18,6 @@ /* Written by Paul Eggert */ -#if HAVE_CONFIG_H -# include -#endif - #if HAVE_INTTYPES_H # include #endif diff --git a/lib/isdir.c b/lib/isdir.c index 11fe426b2..6a56a43d6 100644 --- 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 #endif diff --git a/lib/lchown.c b/lib/lchown.c index ff5679e7f..0b74eac8a 100644 --- a/lib/lchown.c +++ b/lib/lchown.c @@ -17,7 +17,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include #include diff --git a/lib/long-options.c b/lib/long-options.c index 33f1d4627..7c9972a19 100644 --- 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 #endif diff --git a/lib/lstat.c b/lib/lstat.c index 0d539fe4a..f5a22b07b 100644 --- a/lib/lstat.c +++ b/lib/lstat.c @@ -19,7 +19,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#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 a75da9b79..58fa61168 100644 --- 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 #endif #undef malloc diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c index 00519f51a..b0a492590 100644 --- 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 #endif diff --git a/lib/memcmp.c b/lib/memcmp.c index ca68658f3..6928b1e4a 100644 --- a/lib/memcmp.c +++ b/lib/memcmp.c @@ -22,7 +22,7 @@ USA. */ #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif #include diff --git a/lib/memcoll.c b/lib/memcoll.c index d9504b453..82d889f40 100644 --- a/lib/memcoll.c +++ b/lib/memcoll.c @@ -17,7 +17,7 @@ /* Contributed by Paul Eggert . */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/memcpy.c b/lib/memcpy.c index 09fb55d21..2ab5ed6ee 100644 --- a/lib/memcpy.c +++ b/lib/memcpy.c @@ -16,7 +16,7 @@ /* Written by Jim Meyering . */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/memmove.c b/lib/memmove.c index 79cc78273..753c899d3 100644 --- a/lib/memmove.c +++ b/lib/memmove.c @@ -3,7 +3,7 @@ In the public domain. By David MacKenzie . */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/mkdir-p.c b/lib/mkdir-p.c index 4bad68621..efaa8d265 100644 --- a/lib/mkdir-p.c +++ b/lib/mkdir-p.c @@ -19,7 +19,7 @@ /* Written by David MacKenzie and Jim Meyering. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/mkdir.c b/lib/mkdir.c index 807f322e5..c921ecfdb 100644 --- a/lib/mkdir.c +++ b/lib/mkdir.c @@ -19,7 +19,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#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 2683e4b8f..cec5ba8ba 100644 --- 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 +#ifdef HAVE_CONFIG_H +# include +#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 a2697f67f..6ab9cb6fd 100644 --- 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 #endif diff --git a/lib/mountlist.c b/lib/mountlist.c index a8ef87d8c..325b213a2 100644 --- 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 #endif diff --git a/lib/nanosleep.c b/lib/nanosleep.c index f41aed2cf..fa2078507 100644 --- a/lib/nanosleep.c +++ b/lib/nanosleep.c @@ -17,7 +17,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#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 c7800a395..d3ba894ac 100644 --- 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 #endif diff --git a/lib/openat.c b/lib/openat.c index ec51b2d13..443cb3da6 100644 --- a/lib/openat.c +++ b/lib/openat.c @@ -17,7 +17,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include "openat.h" diff --git a/lib/physmem.c b/lib/physmem.c index dabb00ccb..795a0a8da 100644 --- 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 #endif diff --git a/lib/pipe-safer.c b/lib/pipe-safer.c index 579165765..fb02d7217 100644 --- 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 #endif diff --git a/lib/pipe.c b/lib/pipe.c index 5ad293551..730a155ba 100644 --- a/lib/pipe.c +++ b/lib/pipe.c @@ -18,7 +18,7 @@ #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif /* Specification. */ diff --git a/lib/poll.c b/lib/poll.c index bc200f515..807088549 100644 --- 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 #endif #include diff --git a/lib/posixver.c b/lib/posixver.c index 2fa097ae6..3a0bb5201 100644 --- 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 #endif diff --git a/lib/progname.c b/lib/progname.c index ea32128ab..67ecdff70 100644 --- a/lib/progname.c +++ b/lib/progname.c @@ -18,7 +18,7 @@ #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif /* Specification. */ diff --git a/lib/progreloc.c b/lib/progreloc.c index df88d5a82..18e73599a 100644 --- a/lib/progreloc.c +++ b/lib/progreloc.c @@ -18,7 +18,7 @@ #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif /* Specification. */ diff --git a/lib/putenv.c b/lib/putenv.c index 69fb90be6..6acefaaef 100644 --- 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 #endif diff --git a/lib/quote.c b/lib/quote.c index 4c75029a3..16cc939c1 100644 --- a/lib/quote.c +++ b/lib/quote.c @@ -17,7 +17,7 @@ /* Written by Paul Eggert */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/quotearg.c b/lib/quotearg.c index eef237f0e..13bd16ff7 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -19,7 +19,7 @@ /* Written by Paul Eggert */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/raise.c b/lib/raise.c index 8eeea5c89..237d8bf7b 100644 --- a/lib/raise.c +++ b/lib/raise.c @@ -17,7 +17,9 @@ /* written by Jim Meyering */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include #include diff --git a/lib/readline.c b/lib/readline.c index 197262a29..3f8c18ae4 100644 --- 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 #endif /* This module is intended to be used when the application only need diff --git a/lib/readlink.c b/lib/readlink.c index bf8a5f783..3196aecb0 100644 --- 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 #endif diff --git a/lib/readtokens0.c b/lib/readtokens0.c index 494e08d55..55b39a747 100644 --- a/lib/readtokens0.c +++ b/lib/readtokens0.c @@ -17,7 +17,9 @@ Written by Jim Meyering. */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include #include "readtokens0.h" diff --git a/lib/readutmp.c b/lib/readutmp.c index 846ab3c6a..634d9ab1f 100644 --- a/lib/readutmp.c +++ b/lib/readutmp.c @@ -17,7 +17,9 @@ /* Written by jla; revised by djm */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include "readutmp.h" diff --git a/lib/realloc.c b/lib/realloc.c index df570aa63..fe9482223 100644 --- 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 #endif #undef realloc diff --git a/lib/regex.c b/lib/regex.c index 1bfdd6b9c..82e76c091 100644 --- 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 #endif #ifdef _LIBC diff --git a/lib/rename.c b/lib/rename.c index 6f77fd09c..9c9e7f4df 100644 --- 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 #endif #undef rename diff --git a/lib/rmdir.c b/lib/rmdir.c index ad026a641..25564b6b4 100644 --- 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 #endif diff --git a/lib/rpmatch.c b/lib/rpmatch.c index 3e3a38ecf..ba8bc4ce9 100644 --- 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 #endif diff --git a/lib/safe-read.c b/lib/safe-read.c index 904fc71f0..391d7896b 100644 --- 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 #endif diff --git a/lib/same.c b/lib/same.c index 89ee47dd0..f9e707d7e 100644 --- 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 #endif diff --git a/lib/save-cwd.c b/lib/save-cwd.c index 5ad790a4d..7f1b30b96 100644 --- 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 #endif #include "save-cwd.h" diff --git a/lib/savedir.c b/lib/savedir.c index 4eeda0193..a2cf2f678 100644 --- a/lib/savedir.c +++ b/lib/savedir.c @@ -19,7 +19,7 @@ /* Written by David MacKenzie . */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/sig2str.c b/lib/sig2str.c index 25ea5f310..00089be78 100644 --- 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 #endif diff --git a/lib/strcspn.c b/lib/strcspn.c index 7f60620b3..9fbc5de49 100644 --- 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 #endif diff --git a/lib/strerror.c b/lib/strerror.c index 1efb53fcf..623821d2e 100644 --- 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 #endif diff --git a/lib/stripslash.c b/lib/stripslash.c index 870a66f38..9b55da48e 100644 --- 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 #endif diff --git a/lib/strncasecmp.c b/lib/strncasecmp.c index 4e57debf5..72ead013b 100644 --- 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 #endif diff --git a/lib/strndup.c b/lib/strndup.c index b2d7c0e0b..9ac2756a2 100644 --- 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 #endif #include diff --git a/lib/strnlen.c b/lib/strnlen.c index 642c66fac..97a1f810c 100644 --- 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 #endif #undef strnlen diff --git a/lib/strnlen1.c b/lib/strnlen1.c index 6cc2da8df..f3338e7cf 100644 --- 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 #endif diff --git a/lib/strsep.c b/lib/strsep.c index 40c2939c8..db2b074c8 100644 --- 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 +# include #endif /* Specification. */ diff --git a/lib/strstr.c b/lib/strstr.c index 496e19b06..e94cef756 100644 --- 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 #endif diff --git a/lib/strtod.c b/lib/strtod.c index 79a82f29e..7b48754e4 100644 --- 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 #endif diff --git a/lib/strtoimax.c b/lib/strtoimax.c index 4724195ac..43a690d24 100644 --- 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 #endif diff --git a/lib/strtol.c b/lib/strtol.c index 778898159..9bfbe3c1a 100644 --- 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 #endif diff --git a/lib/strverscmp.c b/lib/strverscmp.c index 900c637dd..6276bca0f 100644 --- 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 #endif diff --git a/lib/tempname.c b/lib/tempname.c index 4b0fad3f8..cae42e16d 100644 --- 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 #endif diff --git a/lib/time_r.c b/lib/time_r.c index 1298728ba..245ac924b 100644 --- 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 #endif diff --git a/lib/timespec.h b/lib/timespec.h index 01032f336..8188c208c 100644 --- 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 # if TIME_WITH_SYS_TIME # include diff --git a/lib/unlinkdir.c b/lib/unlinkdir.c index b12d2a492..91a4fb699 100644 --- a/lib/unlinkdir.c +++ b/lib/unlinkdir.c @@ -18,7 +18,9 @@ /* Written by Paul Eggert and Jim Meyering. */ -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include "unlinkdir.h" diff --git a/lib/userspec.c b/lib/userspec.c index 5f5c5bf43..5488c31ec 100644 --- a/lib/userspec.c +++ b/lib/userspec.c @@ -18,7 +18,7 @@ /* Written by David MacKenzie . */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/utimecmp.c b/lib/utimecmp.c index 4c8e6c9ca..7308929f4 100644 --- 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 #endif diff --git a/lib/version-etc-fsf.c b/lib/version-etc-fsf.c index a91ab8687..374100563 100644 --- 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 #endif diff --git a/lib/version-etc.c b/lib/version-etc.c index f27f6a43a..05bc3ad25 100644 --- 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 #endif diff --git a/lib/wait-process.c b/lib/wait-process.c index b36af18bc..221a39c10 100644 --- a/lib/wait-process.c +++ b/lib/wait-process.c @@ -18,7 +18,7 @@ #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif /* Specification. */ diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c index 637933e30..ff5ac9e67 100644 --- 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 #endif diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c index f8116f224..0f798dac0 100644 --- 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 #endif diff --git a/lib/xmalloc.c b/lib/xmalloc.c index 6977703b8..687633c25 100644 --- 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 #endif diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c index 063612e95..f04e468d8 100644 --- a/lib/xmemcoll.c +++ b/lib/xmemcoll.c @@ -17,7 +17,7 @@ /* Contributed by Paul Eggert . */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/xnanosleep.c b/lib/xnanosleep.c index f2d9e93be..bab58eecb 100644 --- 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 #endif diff --git a/lib/xreadlink.c b/lib/xreadlink.c index d56d2a6af..f21812d09 100644 --- a/lib/xreadlink.c +++ b/lib/xreadlink.c @@ -19,7 +19,7 @@ /* Written by Jim Meyering */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib/xsetenv.c b/lib/xsetenv.c index 3e5938650..048337305 100644 --- 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 #endif diff --git a/lib/xstrndup.c b/lib/xstrndup.c index edf83cf87..a62d4bd69 100644 --- 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 #endif diff --git a/lib/xstrtoimax.c b/lib/xstrtoimax.c index b1bc36162..3e585d6e0 100644 --- 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 #endif diff --git a/lib/xstrtol.c b/lib/xstrtol.c index 9940fc770..d01db3ca9 100644 --- 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 #endif diff --git a/lib/xstrtoumax.c b/lib/xstrtoumax.c index d7cf2bed8..e6208a474 100644 --- 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 #endif diff --git a/lib/yesno.c b/lib/yesno.c index e4b945838..a364a1b18 100644 --- 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 #endif -- 2.11.0