diff options
143 files changed, 212 insertions, 160 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 1786690b9f..2c62bb5685 100644 --- 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 0769f2314c..63fb7d7cc7 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 <config.h> #endif diff --git a/lib/__fpending.h b/lib/__fpending.h index 5a5158216c..36a842ed52 100644 --- 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> @@ -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 db883ac41c..36d5845acb 100644 --- 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 f5172d0a21..74c8fd8624 100644 --- 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 345bddabe0..b5d209665b 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 <config.h> +# include <config.h> #endif #include <alloca.h> diff --git a/lib/argp-pvh.c b/lib/argp-pvh.c index 72a74845d4..6bf7c49b81 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 <config.h> +# include <config.h> #endif #include "argp.h" diff --git a/lib/atexit.c b/lib/atexit.c index a401b2ff8c..f4873c9ee3 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 <config.h> +#endif int atexit (void (*f) (void)) diff --git a/lib/backupfile.c b/lib/backupfile.c index f48a1cde87..ae61cbd1b1 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 <config.h> #endif diff --git a/lib/basename.c b/lib/basename.c index 00adc0015e..5cc97cd4a4 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 <config.h> #endif diff --git a/lib/c-stack.c b/lib/c-stack.c index d6e5f60aa6..32088f9c6d 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 <config.h> #endif diff --git a/lib/calloc.c b/lib/calloc.c index 9edbf45523..317b4fff40 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 <config.h> #endif #undef calloc diff --git a/lib/chdir-long.c b/lib/chdir-long.c index 2cc70fa532..a727817251 100644 --- 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 2f17a6ccde..4df90a4843 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 <config.h> #endif #include <stddef.h> diff --git a/lib/chown.c b/lib/chown.c index 2d97902e63..86dd3717c4 100644 --- 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 79d4ed0b8d..5a0986561b 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 <config.h> #endif diff --git a/lib/closeout.c b/lib/closeout.c index fb7d2bb427..5d0509dede 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 <config.h> #endif diff --git a/lib/copy-file.c b/lib/copy-file.c index 4b21eff8eb..8befdfe02d 100644 --- 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 8241c69b0b..4588de3997 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 <config.h> #endif diff --git a/lib/cycle-check.c b/lib/cycle-check.c index 1c6e17cacd..401dd862f5 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 <config.h> #endif diff --git a/lib/dirfd.c b/lib/dirfd.c index d65a35c3ef..18d5e1e5dd 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 <config.h> #endif diff --git a/lib/dirfd.h b/lib/dirfd.h index ce5ab2903e..1223b51d2f 100644 --- 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 f1930c8d2f..e2b9d648c3 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 <config.h> #endif diff --git a/lib/dup-safer.c b/lib/dup-safer.c index 1c46b6e722..8cbee7007b 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 <config.h> #endif diff --git a/lib/dup2.c b/lib/dup2.c index 77deaf62d0..d934da15da 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 <config.h> #endif diff --git a/lib/euidaccess.c b/lib/euidaccess.c index 4bb93aa0b0..15ffdb0723 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 <config.h> #endif diff --git a/lib/exclude.c b/lib/exclude.c index 955c289563..40dd8b5724 100644 --- 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 1c5997b8ac..27d38c32a4 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 <config.h> #endif diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c index 3f07294488..5bd757258d 100644 --- 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 beb336cafa..322baccce3 100644 --- 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 6b50451338..5933bcbd12 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 <config.h> #endif diff --git a/lib/file-type.c b/lib/file-type.c index 0a6c3ee77e..4b811903f0 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 <config.h> #endif diff --git a/lib/fileblocks.c b/lib/fileblocks.c index dd6fb6d3a7..8d4f41c24e 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 <config.h> #endif diff --git a/lib/filemode.c b/lib/filemode.c index a5485b4011..08b9b13bb6 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 <config.h> #endif diff --git a/lib/filenamecat.c b/lib/filenamecat.c index f56697a6d2..f947346303 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 <config.h> #endif diff --git a/lib/findprog.c b/lib/findprog.c index 150056f330..27eee3ba6b 100644 --- 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 ad66ce89ee..06416f6ee5 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 <config.h> #endif diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c index ccaf1219f0..4f2ffa1b85 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 <config.h> #endif diff --git a/lib/free.c b/lib/free.c index 9e3435640e..597088d4eb 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 <config.h> #endif #undef free diff --git a/lib/fsusage.c b/lib/fsusage.c index 83d26af88b..da66b1a0f6 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 <config.h> #endif diff --git a/lib/ftruncate.c b/lib/ftruncate.c index c062fe80d8..d5e1addfc9 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 <config.h> #endif diff --git a/lib/full-write.c b/lib/full-write.c index 9626027420..106f3c7e53 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 <config.h> #endif diff --git a/lib/fwriteerror.c b/lib/fwriteerror.c index 6ffdf526d9..a88c8e1c39 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 <config.h> #endif diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c index e74aa75eb9..cd90769daa 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 <config.h> #endif diff --git a/lib/getcwd.c b/lib/getcwd.c index 86070ead87..9f8c4cc3fe 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 <config.h> #endif #if !_LIBC diff --git a/lib/getdate.h b/lib/getdate.h index dd97807a76..4694cdb666 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 <config.h> -#endif - #include <stdbool.h> #include "timespec.h" diff --git a/lib/getdelim.c b/lib/getdelim.c index 5dc4a38d27..8498b7556a 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 <config.h> #endif diff --git a/lib/getgroups.c b/lib/getgroups.c index 084d1f8288..126f130a06 100644 --- 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 00f02f4aea..ab054fba6b 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 <config.h> #endif diff --git a/lib/getlogin_r.c b/lib/getlogin_r.c index d269b92238..b9b76c64b2 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 <config.h> #endif diff --git a/lib/getndelim2.c b/lib/getndelim2.c index e9f8cb9c53..3c0fa3f05e 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 <config.h> #endif diff --git a/lib/getnline.c b/lib/getnline.c index cabc1d550a..c8cd38c0e2 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 <config.h> #endif diff --git a/lib/getopt1.c b/lib/getopt1.c index 5acd2245af..25d792650f 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 <config.h> +# include <config.h> #endif #ifdef _LIBC diff --git a/lib/getpass.c b/lib/getpass.c index b965bcfc0f..f0b3184eeb 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 <config.h> #endif diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c index f9afc22c1f..eb6de94f1e 100644 --- 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 67fb9fd7c1..09a9ffc78b 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 <config.h> #endif diff --git a/lib/hard-locale.c b/lib/hard-locale.c index b0566ec218..98530fcd5e 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 <config.h> #endif diff --git a/lib/hash-pjw.c b/lib/hash-pjw.c index 76b4db5c7d..315277abb2 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 <config.h> #endif diff --git a/lib/hash.c b/lib/hash.c index 2b5d5c255d..f85bd519bf 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 <config.h> #endif diff --git a/lib/human.c b/lib/human.c index 282a3236f4..ed15c6a24a 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 <config.h> #endif diff --git a/lib/human.h b/lib/human.h index 3b23c123b8..20956ab392 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 <config.h> -# endif - # include <limits.h> # include <stdbool.h> diff --git a/lib/idcache.c b/lib/idcache.c index 82dec8d90c..b559e474c4 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 <config.h> #endif diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c index c5d2eb0030..752f063874 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 <config.h> #endif diff --git a/lib/inttostr.c b/lib/inttostr.c index 23748a1378..2adcd2c131 100644 --- 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 952da97b62..a036a1b7fa 100644 --- 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 11fe426b2b..6a56a43d65 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 <config.h> #endif diff --git a/lib/lchown.c b/lib/lchown.c index ff5679e7f7..0b74eac8a9 100644 --- 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 33f1d4627d..7c9972a198 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 <config.h> #endif diff --git a/lib/lstat.c b/lib/lstat.c index 0d539fe4a6..f5a22b07b2 100644 --- 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 a75da9b795..58fa611682 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 <config.h> #endif #undef malloc diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c index 00519f51ad..b0a492590c 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 <config.h> #endif diff --git a/lib/memcmp.c b/lib/memcmp.c index ca68658f3f..6928b1e4a0 100644 --- 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 d9504b4531..82d889f409 100644 --- 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 09fb55d218..2ab5ed6ee7 100644 --- 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 79cc782739..753c899d38 100644 --- 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 4bad68621b..efaa8d2659 100644 --- 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 807f322e5e..c921ecfdb4 100644 --- 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 2683e4b8f7..cec5ba8bac 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 <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 a2697f67ff..6ab9cb6fdd 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 <config.h> #endif diff --git a/lib/mountlist.c b/lib/mountlist.c index a8ef87d8c8..325b213a26 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 <config.h> #endif diff --git a/lib/nanosleep.c b/lib/nanosleep.c index f41aed2cf3..fa20785072 100644 --- 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 c7800a3959..d3ba894ac7 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 <config.h> #endif diff --git a/lib/openat.c b/lib/openat.c index ec51b2d137..443cb3da65 100644 --- 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 dabb00ccbe..795a0a8da7 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 <config.h> #endif diff --git a/lib/pipe-safer.c b/lib/pipe-safer.c index 5791657654..fb02d72177 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 <config.h> #endif diff --git a/lib/pipe.c b/lib/pipe.c index 5ad293551c..730a155bae 100644 --- 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 bc200f515d..8070885496 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 <config.h> #endif #include <sys/types.h> diff --git a/lib/posixver.c b/lib/posixver.c index 2fa097ae6c..3a0bb52015 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 <config.h> #endif diff --git a/lib/progname.c b/lib/progname.c index ea32128ab4..67ecdff70d 100644 --- 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 df88d5a825..18e73599a1 100644 --- 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 69fb90be61..6acefaaefb 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 <config.h> #endif diff --git a/lib/quote.c b/lib/quote.c index 4c75029a33..16cc939c16 100644 --- 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 eef237f0e6..13bd16ff7a 100644 --- 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 8eeea5c890..237d8bf7b6 100644 --- 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 197262a29c..3f8c18ae44 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 <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 bf8a5f7830..3196aecb03 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 <config.h> #endif diff --git a/lib/readtokens0.c b/lib/readtokens0.c index 494e08d55e..55b39a747f 100644 --- 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 846ab3c6a2..634d9ab1ff 100644 --- 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 df570aa631..fe94822238 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 <config.h> #endif #undef realloc diff --git a/lib/regex.c b/lib/regex.c index 1bfdd6b9cf..82e76c0911 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 <config.h> #endif #ifdef _LIBC diff --git a/lib/rename.c b/lib/rename.c index 6f77fd09c9..9c9e7f4dff 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 <config.h> #endif #undef rename diff --git a/lib/rmdir.c b/lib/rmdir.c index ad026a641b..25564b6b48 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 <config.h> #endif diff --git a/lib/rpmatch.c b/lib/rpmatch.c index 3e3a38ecf0..ba8bc4ce93 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 <config.h> #endif diff --git a/lib/safe-read.c b/lib/safe-read.c index 904fc71f03..391d7896bf 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 <config.h> #endif diff --git a/lib/same.c b/lib/same.c index 89ee47dd09..f9e707d7e2 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 <config.h> #endif diff --git a/lib/save-cwd.c b/lib/save-cwd.c index 5ad790a4d3..7f1b30b96e 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 <config.h> #endif #include "save-cwd.h" diff --git a/lib/savedir.c b/lib/savedir.c index 4eeda01939..a2cf2f6787 100644 --- 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 25ea5f3100..00089be782 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 <config.h> #endif diff --git a/lib/strcspn.c b/lib/strcspn.c index 7f60620b3f..9fbc5de491 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 <config.h> #endif diff --git a/lib/strerror.c b/lib/strerror.c index 1efb53fcff..623821d2e3 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 <config.h> #endif diff --git a/lib/stripslash.c b/lib/stripslash.c index 870a66f387..9b55da48ed 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 <config.h> #endif diff --git a/lib/strncasecmp.c b/lib/strncasecmp.c index 4e57debf51..72ead013be 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 <config.h> #endif diff --git a/lib/strndup.c b/lib/strndup.c index b2d7c0e0bb..9ac2756a2b 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 <config.h> #endif #include <stdlib.h> diff --git a/lib/strnlen.c b/lib/strnlen.c index 642c66fac8..97a1f810c5 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 <config.h> #endif #undef strnlen diff --git a/lib/strnlen1.c b/lib/strnlen1.c index 6cc2da8dfe..f3338e7cf4 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 <config.h> #endif diff --git a/lib/strsep.c b/lib/strsep.c index 40c2939c8e..db2b074c85 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 <config.h> +# include <config.h> #endif /* Specification. */ diff --git a/lib/strstr.c b/lib/strstr.c index 496e19b06a..e94cef7568 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 <config.h> #endif diff --git a/lib/strtod.c b/lib/strtod.c index 79a82f29e8..7b48754e43 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 <config.h> #endif diff --git a/lib/strtoimax.c b/lib/strtoimax.c index 4724195ac7..43a690d24b 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 <config.h> #endif diff --git a/lib/strtol.c b/lib/strtol.c index 778898159b..9bfbe3c1af 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 <config.h> #endif diff --git a/lib/strverscmp.c b/lib/strverscmp.c index 900c637dd1..6276bca0fa 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 <config.h> #endif diff --git a/lib/tempname.c b/lib/tempname.c index 4b0fad3f87..cae42e16d0 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 <config.h> #endif diff --git a/lib/time_r.c b/lib/time_r.c index 1298728ba8..245ac924be 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 <config.h> #endif diff --git a/lib/timespec.h b/lib/timespec.h index 01032f3363..8188c208c0 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 <sys/types.h> # if TIME_WITH_SYS_TIME # include <sys/time.h> diff --git a/lib/unlinkdir.c b/lib/unlinkdir.c index b12d2a4925..91a4fb699c 100644 --- 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 5f5c5bf43c..5488c31ec8 100644 --- 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 4c8e6c9caf..7308929f43 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 <config.h> #endif diff --git a/lib/version-etc-fsf.c b/lib/version-etc-fsf.c index a91ab86873..374100563f 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 <config.h> #endif diff --git a/lib/version-etc.c b/lib/version-etc.c index f27f6a43af..05bc3ad255 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 <config.h> #endif diff --git a/lib/wait-process.c b/lib/wait-process.c index b36af18bcf..221a39c10e 100644 --- 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 637933e308..ff5ac9e675 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 <config.h> #endif diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c index f8116f2243..0f798dac06 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 <config.h> #endif diff --git a/lib/xmalloc.c b/lib/xmalloc.c index 6977703b80..687633c250 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 <config.h> #endif diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c index 063612e95a..f04e468d8f 100644 --- 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 f2d9e93be3..bab58eecb4 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 <config.h> #endif diff --git a/lib/xreadlink.c b/lib/xreadlink.c index d56d2a6af4..f21812d094 100644 --- 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 3e5938650a..048337305e 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 <config.h> #endif diff --git a/lib/xstrndup.c b/lib/xstrndup.c index edf83cf87f..a62d4bd695 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 <config.h> #endif diff --git a/lib/xstrtoimax.c b/lib/xstrtoimax.c index b1bc361629..3e585d6e00 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 <config.h> #endif diff --git a/lib/xstrtol.c b/lib/xstrtol.c index 9940fc7705..d01db3ca9e 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 <config.h> #endif diff --git a/lib/xstrtoumax.c b/lib/xstrtoumax.c index d7cf2bed81..e6208a4740 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 <config.h> #endif diff --git a/lib/yesno.c b/lib/yesno.c index e4b945838e..a364a1b18d 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 <config.h> #endif |