Mercurial > hg > octave-kai > gnulib-hg
changeset 6259:96c32553b4c6
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.
line wrap: on
line diff
--- 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.
--- 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
--- 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>
--- 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
--- 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
--- 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>
--- 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>
--- 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"
--- 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))
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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>
--- 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
--- 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
--- 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
--- 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. */
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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. */
--- 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>
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/lib/findprog.c +++ b/lib/findprog.c @@ -18,7 +18,7 @@ #ifdef HAVE_CONFIG_H -# include "config.h" +# include <config.h> #endif /* Specification. */
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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>
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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. */
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>
--- 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
--- 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
--- 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
--- 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
--- 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>
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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) */
--- 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
--- 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"
--- 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
--- 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
--- a/lib/pipe.c +++ b/lib/pipe.c @@ -18,7 +18,7 @@ #ifdef HAVE_CONFIG_H -# include "config.h" +# include <config.h> #endif /* Specification. */
--- 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>
--- 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
--- a/lib/progname.c +++ b/lib/progname.c @@ -18,7 +18,7 @@ #ifdef HAVE_CONFIG_H -# include "config.h" +# include <config.h> #endif /* Specification. */
--- a/lib/progreloc.c +++ b/lib/progreloc.c @@ -18,7 +18,7 @@ #ifdef HAVE_CONFIG_H -# include "config.h" +# include <config.h> #endif /* Specification. */
--- 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
--- 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
--- 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
--- 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>
--- 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
--- 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
--- 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"
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>
--- 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
--- 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
--- 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. */
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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. */
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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