* _fpending.c: Include <config.h> unconditionally, since we no

longer worry about uses that don't define HAVE_CONFIG_H.
* acl.c, alloca.c, argmatch.c, atexit.c, backupfile.c:
* basename.c, c-stack.c, c-strtod.c, calloc.c, canon-host.c:
* canonicalize.c, chdir-long.c, chdir-safer.c, chown.c:
* cloexec.c, close-stream.c, closeout.c, creat-safer.c:
* cycle-check.c, diacrit.c, dirchownmod.c, dirfd.c, dirname.c:
* dup-safer.c, dup2.c, error.c, euidaccess.c, exclude.c:
* exitfail.c, fchmodat.c, fchown-stub.c, fd-safer.c:
* file-type.c, fileblocks.c, filemode.c, filenamecat.c:
* fnmatch.c, fopen-safer.c, fprintftime.c, free.c, fsusage.c:
* ftruncate.c, fts-cycle.c, fts.c, full-write.c, gai_strerror.c:
* getcwd.c, getdate.y, getdomainname.c, getgroups.c:
* gethostname.c, gethrxtime.c, getloadavg.c, getlogin_r.c:
* getndelim2.c, getnline.c, getopt.c, getopt1.c, getpass.c:
* gettime.c, gettimeofday.c, getugroups.c, getusershell.c:
* glob.c, group-member.c, hard-locale.c, hash-pjw.c, hash.c:
* human.c, idcache.c, inet_ntop.c, inet_pton.c, inttostr.c:
* isdir.c, lchown.c, linebuffer.c, long-options.c, lstat.c:
* malloc.c, md5.c, memcasecmp.c, memchr.c, memcmp.c, memcoll.c:
* memcpy.c, memmove.c, memrchr.c, mkancesdirs.c, mkdir-p.c:
* mkdir.c, mkdirat.c, mkstemp-safer.c, mkstemp.c, modechange.c:
* mountlist.c, nanosleep.c, obstack.c, open-safer.c:
* openat-die.c, openat.c, pagealign_alloc.c, physmem.c:
* pipe-safer.c, posixtm.c, posixver.c, putenv.c, quote.c:
* quotearg.c, raise.c, readtokens.c, readtokens0.c, readutmp.c:
* realloc.c, regex.c, rename.c, rmdir.c, rpmatch.c, safe-read.c:
* same.c, save-cwd.c, savedir.c, setenv.c, settime.c, sha1.c:
* sig2str.c, snprintf.c, strdup.c, strerror.c, strftime.c:
* stripslash.c, strndup.c, strnlen.c, strpbrk.c, strtod.c:
* strtoimax.c, strtol.c, strverscmp.c, tempname.c, time_r.c:
* timegm.c, tmpfile-safer.c, unlinkdir.c, userspec.c, utime.c:
* utimecmp.c, utimens.c, version-etc-fsf.c, version-etc.c:
* xalloc-die.c, xgetcwd.c, xgethostname.c, xmalloc.c:
* xmemcoll.c, xnanosleep.c, xreadlink.c, xstrtod.c:
* xstrtoimax.c, xstrtol.c, xstrtoumax.c, yesno.c:
Likewise.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 33b50803b3323c04b96973e42f40e0c4f01ea747..dd9b4626c7a6c55a3bef4be549f387610f097aa2 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,43 @@
+2006-09-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * _fpending.c: Include <config.h> unconditionally, since we no
+       longer worry about uses that don't define HAVE_CONFIG_H.
+       * acl.c, alloca.c, argmatch.c, atexit.c, backupfile.c:
+       * basename.c, c-stack.c, c-strtod.c, calloc.c, canon-host.c:
+       * canonicalize.c, chdir-long.c, chdir-safer.c, chown.c:
+       * cloexec.c, close-stream.c, closeout.c, creat-safer.c:
+       * cycle-check.c, diacrit.c, dirchownmod.c, dirfd.c, dirname.c:
+       * dup-safer.c, dup2.c, error.c, euidaccess.c, exclude.c:
+       * exitfail.c, fchmodat.c, fchown-stub.c, fd-safer.c:
+       * file-type.c, fileblocks.c, filemode.c, filenamecat.c:
+       * fnmatch.c, fopen-safer.c, fprintftime.c, free.c, fsusage.c:
+       * ftruncate.c, fts-cycle.c, fts.c, full-write.c, gai_strerror.c:
+       * getcwd.c, getdate.y, getdomainname.c, getgroups.c:
+       * gethostname.c, gethrxtime.c, getloadavg.c, getlogin_r.c:
+       * getndelim2.c, getnline.c, getopt.c, getopt1.c, getpass.c:
+       * gettime.c, gettimeofday.c, getugroups.c, getusershell.c:
+       * glob.c, group-member.c, hard-locale.c, hash-pjw.c, hash.c:
+       * human.c, idcache.c, inet_ntop.c, inet_pton.c, inttostr.c:
+       * isdir.c, lchown.c, linebuffer.c, long-options.c, lstat.c:
+       * malloc.c, md5.c, memcasecmp.c, memchr.c, memcmp.c, memcoll.c:
+       * memcpy.c, memmove.c, memrchr.c, mkancesdirs.c, mkdir-p.c:
+       * mkdir.c, mkdirat.c, mkstemp-safer.c, mkstemp.c, modechange.c:
+       * mountlist.c, nanosleep.c, obstack.c, open-safer.c:
+       * openat-die.c, openat.c, pagealign_alloc.c, physmem.c:
+       * pipe-safer.c, posixtm.c, posixver.c, putenv.c, quote.c:
+       * quotearg.c, raise.c, readtokens.c, readtokens0.c, readutmp.c:
+       * realloc.c, regex.c, rename.c, rmdir.c, rpmatch.c, safe-read.c:
+       * same.c, save-cwd.c, savedir.c, setenv.c, settime.c, sha1.c:
+       * sig2str.c, snprintf.c, strdup.c, strerror.c, strftime.c:
+       * stripslash.c, strndup.c, strnlen.c, strpbrk.c, strtod.c:
+       * strtoimax.c, strtol.c, strverscmp.c, tempname.c, time_r.c:
+       * timegm.c, tmpfile-safer.c, unlinkdir.c, userspec.c, utime.c:
+       * utimecmp.c, utimens.c, version-etc-fsf.c, version-etc.c:
+       * xalloc-die.c, xgetcwd.c, xgethostname.c, xmalloc.c:
+       * xmemcoll.c, xnanosleep.c, xreadlink.c, xstrtod.c:
+       * xstrtoimax.c, xstrtol.c, xstrtoumax.c, yesno.c:
+       Likewise.
+
 2006-09-12  Jim Meyering  <jim@meyering.net>
 
        * nanosleep.c: Include <sys/types.h> before sys/select.h, to avoid

diff --git a/lib/__fpending.c b/lib/__fpending.c
index 63fb7d7cc7334e1058ffb6e11c21ab2340ea3657..221aee69de9f7b1f72db2d0a9a88512ad16d926b 100644 (file)
--- a/lib/__fpending.c
+++ b/lib/__fpending.c
@@ -1,5 +1,5 @@
 /* __fpending.c -- return the number of pending output bytes on a stream
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
 
 /* Written by Jim Meyering. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "__fpending.h"
 

diff --git a/lib/acl.c b/lib/acl.c
index b5c1ee94498b08d54cf06505932829c08d04a2f6..f891685fd44c8ec9c0197d858ca8544cd49fd0b7 100644 (file)
--- a/lib/acl.c
+++ b/lib/acl.c
@@ -1,6 +1,6 @@
 /* acl.c - access control lists
 
-   Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
 
    Written by Paul Eggert and Andreas Gruenbacher.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdbool.h>
 #include <stdlib.h>

diff --git a/lib/alloca.c b/lib/alloca.c
index d1d54475bbbf363bc7caf0a59e651da53c085b12..3a1f4e273a56b8f4f65e39c35577a1826343de24 100644 (file)
--- a/lib/alloca.c
+++ b/lib/alloca.c
@@ -21,9 +21,7 @@
    allocating any.  It is a good idea to use alloca(0) in
    your main control loop, etc. to force garbage collection.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <alloca.h>
 

diff --git a/lib/argmatch.c b/lib/argmatch.c
index 36d5845acb7812c55a908234d0a76361ad7a1922..c6cdfcc8203cb77d31e478e5db00805ef0cd855a 100644 (file)
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -1,7 +1,7 @@
 /* argmatch.c -- find a match for a string in an array
 
-   Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003, 2004, 2005 Free
-   Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,9 +20,7 @@
 /* Written by David MacKenzie <djm@ai.mit.edu>
    Modified by Akim Demaille <demaille@inf.enst.fr> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "argmatch.h"

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

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

diff --git a/lib/basename.c b/lib/basename.c
index 8c3dbece7bf1b907112b7b818e83c26b2fcfd0e0..fbe17ff910c8e8ee93eec92dbb7274739f8e821e 100644 (file)
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "dirname.h"
 

diff --git a/lib/c-stack.c b/lib/c-stack.c
index b4c32651d15e7972f46b41d76f5c288aae596f89..7606855c7755771218b8efe306a647cbd0280884 100644 (file)
--- a/lib/c-stack.c
+++ b/lib/c-stack.c
@@ -34,9 +34,7 @@
 
    No attempt has been made to deal with multithreaded applications.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #ifndef __attribute__
 # if __GNUC__ < 3 || __STRICT_ANSI__
@@ -304,6 +302,6 @@ main (int argc __attribute__ ((unused)), char **argv)
 \f
 /*
 Local Variables:
-compile-command: "gcc -DDEBUG -DHAVE_CONFIG_H -I.. -g -O -Wall -W c-stack.c"
+compile-command: "gcc -DDEBUG -g -O -Wall -W c-stack.c"
 End:
 */

diff --git a/lib/c-strtod.c b/lib/c-strtod.c
index 031f5f877b8fa86fac17bbefcb7ced7312633b9e..2234ed0f8d495397029db23a356ca0b18f7f5053 100644 (file)
--- a/lib/c-strtod.c
+++ b/lib/c-strtod.c
@@ -1,6 +1,6 @@
 /* Convert string to double, using the C locale.
 
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "c-strtod.h"
 

diff --git a/lib/calloc.c b/lib/calloc.c
index 317b4fff405f0e8ca5abb4ade54c01c1650aca30..c8b1e1ebabd0d29c791b333b6f16234b45ebc254 100644 (file)
--- a/lib/calloc.c
+++ b/lib/calloc.c
@@ -1,6 +1,6 @@
 /* calloc() function that is glibc compatible.
    This wrapper function is required at least on Tru64 UNIX 5.1.
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #undef calloc
 
 #include <stdlib.h>

diff --git a/lib/canon-host.c b/lib/canon-host.c
index e2bd1a773b0cebf8d2232e49322dd13e25d3f38e..c0b7c13445874f92207c3acae929dbbf1c125931 100644 (file)
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -1,6 +1,6 @@
 /* Host name canonicalization
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    Written by Derek Price <derek@ximbiot.com>.
 
@@ -18,9 +18,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "canon-host.h"
 

diff --git a/lib/canonicalize.c b/lib/canonicalize.c
index 84368a493a72c4f5e3e3fa8eb892873e6a6ba8c1..dccb4724c0bd9abd7c82e3552d2deb26a15daefc 100644 (file)
--- a/lib/canonicalize.c
+++ b/lib/canonicalize.c
@@ -1,5 +1,5 @@
 /* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,9 +16,7 @@
    If not, write to the Free Software Foundation,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "canonicalize.h"
 

diff --git a/lib/chdir-long.c b/lib/chdir-long.c
index 50cae34b5677835958e8cb61c7907c7789260749..8d0f0622288465dad6af1a4947dddb8d0300f93b 100644 (file)
--- a/lib/chdir-long.c
+++ b/lib/chdir-long.c
@@ -17,9 +17,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "chdir-long.h"
 
@@ -263,6 +261,6 @@ main (int argc, char *argv[])
 
 /*
 Local Variables:
-compile-command: "gcc -DTEST_CHDIR=1 -DHAVE_CONFIG_H -I.. -g -O -W -Wall chdir-long.c libcoreutils.a"
+compile-command: "gcc -DTEST_CHDIR=1 -g -O -W -Wall chdir-long.c libcoreutils.a"
 End:
 */

diff --git a/lib/chdir-safer.c b/lib/chdir-safer.c
index f798ff28f81020a21814f5786e2128f9b98968c8..09b2738ffa1d68113cbe7a935ebdb0c81686d8d4 100644 (file)
--- a/lib/chdir-safer.c
+++ b/lib/chdir-safer.c
@@ -18,9 +18,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "chdir-safer.h"
 

diff --git a/lib/chown.c b/lib/chown.c
index 2a7bba1a6c09e1bfc4b21c4355a1e87960d62f7a..5c8b32e0272fd8b3749790fe3b0caff7d065c6dd 100644 (file)
--- a/lib/chown.c
+++ b/lib/chown.c
@@ -1,6 +1,7 @@
 /* provide consistent interface to chown for systems that don't interpret
    an ID of -1 as meaning `don't change the corresponding ID'.
-   Copyright (C) 1997, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 1997, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +19,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* 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 cf2308ca1a506549ab709c3fcc07e8c39ec829c4..6480006a5b46ca5ea4d745a43e12617de5c55ee7 100644 (file)
--- a/lib/cloexec.c
+++ b/lib/cloexec.c
@@ -1,5 +1,6 @@
 /* closexec.c - set or clear the close-on-exec descriptor flag
-   Copyright (C) 1991, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 1991, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
    The code is taken from glibc/manual/llio.texi  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "cloexec.h"
 

diff --git a/lib/close-stream.c b/lib/close-stream.c
index d7551d67ff0c51fe933a9ff3ec37dbc619c92416..72d0d6816ce2c639e3c15a3488a81e41bc30fab5 100644 (file)
--- a/lib/close-stream.c
+++ b/lib/close-stream.c
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "close-stream.h"
 

diff --git a/lib/closeout.c b/lib/closeout.c
index f298d4bed89ed00ea83fd3d8906a29fbae71d05a..e4093fbd5f9278968fd97aa9eef0f72de169d3fa 100644 (file)
--- a/lib/closeout.c
+++ b/lib/closeout.c
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "closeout.h"
 

diff --git a/lib/creat-safer.c b/lib/creat-safer.c
index 4588de39976faa5116a61771b35b82c3b3cd354a..f4a2e59db15f4e9ea183cc61b0e877b44192a38d 100644 (file)
--- a/lib/creat-safer.c
+++ b/lib/creat-safer.c
@@ -1,5 +1,6 @@
 /* Invoke creat, but avoid some glitches.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "fcntl-safer.h"
 

diff --git a/lib/cycle-check.c b/lib/cycle-check.c
index d8a3ca01d62eeb2f1f41981ca8ae4dcba99d374d..5359d71e0875a793dcc94eb9f6d8093b0c1bb095 100644 (file)
--- a/lib/cycle-check.c
+++ b/lib/cycle-check.c
@@ -19,9 +19,7 @@
 
 /* Written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/lib/diacrit.c b/lib/diacrit.c
index 87dca2bc7e74f86dd888c9a4bd30a1f0aa173b46..fc2d6b71dd49e0cf902d3d2b36806a7a08a95984 100644 (file)
--- a/lib/diacrit.c
+++ b/lib/diacrit.c
@@ -1,5 +1,8 @@
 /* Diacritics processing for a few character codes.
-   Copyright (C) 1990, 1991, 1992, 1993, 2000 Free Software Foundation, Inc.
+
+   Copyright (C) 1990, 1991, 1992, 1993, 2000, 2006 Free Software
+   Foundation, Inc.
+
    François Pinard <pinard@iro.umontreal.ca>, 1988.
 
    All this file is a temporary hack, waiting for locales in GNU.
@@ -19,9 +22,7 @@
    If not, write to the Free Software Foundation,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "diacrit.h"
 

diff --git a/lib/dirchownmod.c b/lib/dirchownmod.c
index 84137fad3f09579cd26bf3051ed9bfb0f54f02be..11abe90cd77d1ed25ab4f3de4b40d80403fcfd02 100644 (file)
--- a/lib/dirchownmod.c
+++ b/lib/dirchownmod.c
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "dirchownmod.h"
 

diff --git a/lib/dirfd.c b/lib/dirfd.c
index 18d5e1e5dd9f5e7fdf24153a502efa4616242f24..06cb3c46f8d61710e1553c2f4a1c98ccbdcdedc3 100644 (file)
--- a/lib/dirfd.c
+++ b/lib/dirfd.c
@@ -1,5 +1,6 @@
 /* dirfd.c -- return the file descriptor associated with an open DIR*
-   Copyright (C) 2001 Free Software Foundation, Inc.
+
+   Copyright (C) 2001, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Written by Jim Meyering. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "dirfd.h"
 

diff --git a/lib/dirname.c b/lib/dirname.c
index e3c762c7df2e92bb2376b164c093783599f98387..16552c64d2a377f7697bf604f2f32a59abc961e9 100644 (file)
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "dirname.h"
 

diff --git a/lib/dup-safer.c b/lib/dup-safer.c
index 8cbee7007b2b90218e668a81ff6f298f1822f4d3..d0606eeb4cef6b83429858d7618a70dff992ad2f 100644 (file)
--- a/lib/dup-safer.c
+++ b/lib/dup-safer.c
@@ -1,5 +1,6 @@
 /* Invoke dup, but avoid some glitches.
-   Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "unistd-safer.h"
 

diff --git a/lib/dup2.c b/lib/dup2.c
index f581d855de378d7c05a544a1ca2b3d52d346104a..5e77204577fac81fddcd1a9ab9845b5b2fa8a267 100644 (file)
--- a/lib/dup2.c
+++ b/lib/dup2.c
@@ -1,5 +1,6 @@
 /* Duplicate an open file descriptor to a specified file descriptor.
-   Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* written by Paul Eggert */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <errno.h>
 #include <fcntl.h>

diff --git a/lib/error.c b/lib/error.c
index e6e680743cb92c86a2a70464b99f8e91081f6da5..cf8634332020392497c23a438eef02aaaa0c71eb 100644 (file)
--- a/lib/error.c
+++ b/lib/error.c
@@ -18,7 +18,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#ifdef HAVE_CONFIG_H
+#if !_LIBC
 # include <config.h>
 #endif
 

diff --git a/lib/euidaccess.c b/lib/euidaccess.c
index 44c5a07bc64dd433da798de7cc302e4824d5186b..38480866601704740e759daed3a82dbc6c1d63e8 100644 (file)
--- a/lib/euidaccess.c
+++ b/lib/euidaccess.c
@@ -1,7 +1,7 @@
 /* euidaccess -- check if effective user id can access file
 
-   Copyright (C) 1990, 1991, 1995, 1998, 2000, 2003, 2004, 2005 Free
-   Software Foundation, Inc.
+   Copyright (C) 1990, 1991, 1995, 1998, 2000, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
    This file is part of the GNU C Library.
 
@@ -22,11 +22,8 @@
 /* Written by David MacKenzie and Torbjorn Granlund.
    Adapted for GNU C library by Roland McGrath.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifndef _LIBC
+# include <config.h>
 # include "euidaccess.h"
 #endif
 

diff --git a/lib/exclude.c b/lib/exclude.c
index f5978a966e01fca373bbd2914b7d3d2ff3953a2b..508b888447f6d487e63157bd3c92a6e7192ddf43 100644 (file)
--- a/lib/exclude.c
+++ b/lib/exclude.c
@@ -20,9 +20,7 @@
 
 /* Written by Paul Eggert <eggert@twinsun.com>  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdbool.h>
 

diff --git a/lib/exitfail.c b/lib/exitfail.c
index 24df22851eb79f33010551b2cd53660add40950a..97abc674ecb10a6168080f5985aa03fad802dfa1 100644 (file)
--- a/lib/exitfail.c
+++ b/lib/exitfail.c
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
    If not, write to the Free Software Foundation,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "exitfail.h"
 #include "exit.h"

diff --git a/lib/fchmodat.c b/lib/fchmodat.c
index 62327f83e76ed6570487f9f07c94289dee2be388..2598b7015f0f39c4b302b8a08081dc09eda2c50b 100644 (file)
--- a/lib/fchmodat.c
+++ b/lib/fchmodat.c
@@ -17,9 +17,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "openat.h"
 #include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */

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

diff --git a/lib/fd-safer.c b/lib/fd-safer.c
index 5933bcbd120af90bab7407cfa3be97451342aec5..256bfa4a0e952a766588eeb7e0dc2748b2f33b36 100644 (file)
--- a/lib/fd-safer.c
+++ b/lib/fd-safer.c
@@ -1,6 +1,6 @@
 /* Return a safer copy of a file descriptor.
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "unistd-safer.h"
 

diff --git a/lib/file-type.c b/lib/file-type.c
index 4b811903f0e9f97968d9a2720f1ced16e6f251d5..b6415c3fc8d24270eeb8fea64c1a91f30ac9c4dd 100644 (file)
--- a/lib/file-type.c
+++ b/lib/file-type.c
@@ -1,7 +1,7 @@
 /* Return a string describing the type of a file.
 
-   Copyright (C) 1993, 1994, 2001, 2002, 2004, 2005 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2004, 2005, 2006 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "file-type.h"
 

diff --git a/lib/fileblocks.c b/lib/fileblocks.c
index 4244e535cc61b760ba6a0d443aa64ac84ebc73bc..4024d1ef24ff1b690e242862e37720141fe79918 100644 (file)
--- a/lib/fileblocks.c
+++ b/lib/fileblocks.c
@@ -18,10 +18,8 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Brian L. Matthews, blm@6sceng.UUCP. */
-\f
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+
+#include <config.h>
 
 #include <sys/types.h>
 

diff --git a/lib/filemode.c b/lib/filemode.c
index 5636c9e7c0480449d6dd098172d46ecae4b4ce8e..0d34161c0f7e6be934e0300fbeb07878aa285e6e 100644 (file)
--- a/lib/filemode.c
+++ b/lib/filemode.c
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "filemode.h"
 

diff --git a/lib/filenamecat.c b/lib/filenamecat.c
index 399d7db317489859dcc470555e7bba56283ee443..bccffb25d84c8d30e8830ad11ad05e75091e4880 100644 (file)
--- a/lib/filenamecat.c
+++ b/lib/filenamecat.c
@@ -19,9 +19,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "filenamecat.h"

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

diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c
index 4f2ffa1b850c41058ee9d0f03ebaa9bf5da7d6fc..3502dbaa8c3b07c2a3128808212f5308e1d221c7 100644 (file)
--- a/lib/fopen-safer.c
+++ b/lib/fopen-safer.c
@@ -1,5 +1,6 @@
 /* Invoke fopen, but avoid some glitches.
-   Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "stdio-safer.h"
 

diff --git a/lib/fprintftime.c b/lib/fprintftime.c
index 879726bec7ed46d66bfd02dd732c0a556d0c3595..2a455275b7efbb04356e26588f60b229e6c2563a 100644 (file)
--- a/lib/fprintftime.c
+++ b/lib/fprintftime.c
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "fprintftime.h"
 #define FPRINTFTIME 1

diff --git a/lib/free.c b/lib/free.c
index 597088d4eb435a407a8f395bed92230e24854252..73a125a75f360715222b32eb0ecbd5b471a7e982 100644 (file)
--- a/lib/free.c
+++ b/lib/free.c
@@ -1,6 +1,6 @@
 /* Work around incompatibility on older systems where free (NULL) fails.
 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
 
 /* written by Paul Eggert */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #undef free
 
 #include <stdlib.h>

diff --git a/lib/fsusage.c b/lib/fsusage.c
index 0bb62244755bd8fab46d0b01f8e199dc216e2511..1e43ede0a86cc3b5c827c09b1f8260c260663fd0 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "fsusage.h"
 

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

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

diff --git a/lib/fts.c b/lib/fts.c
index f2cc54adca8d70d20bfb8c67dcd458a30a444b78..51115a8feeed4c8fd32840361aa7ee8a6ab0fefe 100644 (file)
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -45,9 +45,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)fts.c      8.6 (Berkeley) 8/14/94";

diff --git a/lib/full-write.c b/lib/full-write.c
index c4624e5dc6639a73a5dc14a44e88246db7986e87..f098d41e898ef3fb8e2dace95e33a07c74b556af 100644 (file)
--- a/lib/full-write.c
+++ b/lib/full-write.c
@@ -1,7 +1,7 @@
 /* An interface to read and write that retries (if necessary) until complete.
 
    Copyright (C) 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005 Free Software Foundation, Inc.
+   2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #ifdef FULL_READ

diff --git a/lib/gai_strerror.c b/lib/gai_strerror.c
index d97b858be6f06166f6e2510d8bcf960d9ae11708..7f0e034e661f5818a550e7dc25518b11125e898b 100644 (file)
--- a/lib/gai_strerror.c
+++ b/lib/gai_strerror.c
@@ -16,11 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifndef _LIBC
+# include <config.h>
 # include "getaddrinfo.h"
 #endif
 

diff --git a/lib/getcwd.c b/lib/getcwd.c
index 614ded18d59d173f0246643a9f18a3fa814261df..292bc19a333a67cd970acd1f5846925aa8f08959 100644 (file)
--- a/lib/getcwd.c
+++ b/lib/getcwd.c
@@ -16,11 +16,8 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #if !_LIBC
+# include <config.h>
 # include "getcwd.h"
 #endif
 

diff --git a/lib/getdate.y b/lib/getdate.y
index d874d689ef0d854e74df2279e399092de95e206d..29a4be14616fa403c2aad8f0374994d06aea8c67 100644 (file)
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -32,9 +32,7 @@
 /* FIXME: Check for arithmetic overflow in all cases, not just
    some of them.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "getdate.h"
 

diff --git a/lib/getdomainname.c b/lib/getdomainname.c
index 513b4e8f1b95c75dee6e76507b266d5a1668da47..e27cd7dcb4dee85d5839e340c7e6c4731191fad2 100644 (file)
--- a/lib/getdomainname.c
+++ b/lib/getdomainname.c
@@ -1,5 +1,6 @@
 /* getdomainname emulation for systems that doesn't have it.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Written by Simon Josefsson.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification. */
 #include "getdomainname.h"

diff --git a/lib/getgroups.c b/lib/getgroups.c
index 126f130a06f608d940d5bb784637b57b77fc4c20..615bd4f5d3d83311b3de3969482453b06e4526c1 100644 (file)
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -1,5 +1,6 @@
 /* provide consistent interface to getgroups for systems that don't allow N==0
-   Copyright (C) 1996, 1999, 2003 Free Software Foundation, Inc.
+
+   Copyright (C) 1996, 1999, 2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,8 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <errno.h>

diff --git a/lib/gethostname.c b/lib/gethostname.c
index f05ed85d535166cc67a7d1ff8e14204fc69646b4..eedc40ec4fe563123c6510af3991195265ca5ad2 100644 (file)
--- a/lib/gethostname.c
+++ b/lib/gethostname.c
@@ -1,5 +1,6 @@
 /* gethostname emulation for SysV and POSIX.1.
-   Copyright (C) 1992, 2003 Free Software Foundation, Inc.
+
+   Copyright (C) 1992, 2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* David MacKenzie <djm@gnu.ai.mit.edu> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #ifdef HAVE_UNAME
 # include <sys/utsname.h>

diff --git a/lib/gethrxtime.c b/lib/gethrxtime.c
index 6ece8ae1896267b0e842e417eecd3ff31cdd1208..f3d41c7b9a24736e1e2ff597bceaa1f99f19d9fe 100644 (file)
--- a/lib/gethrxtime.c
+++ b/lib/gethrxtime.c
@@ -1,6 +1,6 @@
 /* gethrxtime -- get high resolution real time
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "gethrxtime.h"
 

diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index f2b05bb573aeb718b5f84b10a1bf535cc06dc551..cfa62735bb1244402d8c71ced1589f5ce6ee780d 100644 (file)
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -84,13 +84,8 @@
 /* "configure" defines CONFIGURING_GETLOADAVG to sidestep problems
    with partially-configured source directories.  */
 
-#ifdef HAVE_CONFIG_H
-# ifndef CONFIGURING_GETLOADAVG
-#  include <config.h>
-# endif
-#endif
-
 #ifndef CONFIGURING_GETLOADAVG
+# include <config.h>
 # include <stdbool.h>
 #endif
 

diff --git a/lib/getlogin_r.c b/lib/getlogin_r.c
index 371164a51d72fdda9891d819ba98f81891ef7ca6..55190f0758058eb589b60de0fbaef95001093f0b 100644 (file)
--- a/lib/getlogin_r.c
+++ b/lib/getlogin_r.c
@@ -1,6 +1,6 @@
 /* Provide a working getlogin_r for systems which lack it.
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
 
 /* written by Paul Eggert and Derek Price */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "getlogin_r.h"
 

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

diff --git a/lib/getnline.c b/lib/getnline.c
index c8cd38c0e21a9cbcfe8fc55c4ae177e7fc9ea8c5..21ab0ac277382c7e150cb4451d0e6703300a13e6 100644 (file)
--- a/lib/getnline.c
+++ b/lib/getnline.c
@@ -1,6 +1,6 @@
 /* getnline - Read a line from a stream, with bounded memory allocation.
 
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "getnline.h"

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

diff --git a/lib/getopt1.c b/lib/getopt1.c
index 25d792650f7351705012b0aa7608ebe7fa76d075..cc0746ea43cecc504f6313f6683eee4ff30bcd20 100644 (file)
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -1,5 +1,5 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
+   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004,2006
      Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -17,13 +17,10 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 \f
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifdef _LIBC
 # include <getopt.h>
 #else
+# include <config.h>
 # include "getopt.h"
 #endif
 #include "getopt_int.h"

diff --git a/lib/getpass.c b/lib/getpass.c
index 4e3339659d1bcd303ee2671623eba695f8aa1b45..70851b3e1a579afc436907363949f51e32bb6a12 100644 (file)
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -1,4 +1,6 @@
-/* Copyright (C) 1992-2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2001, 2003, 2004, 2005, 2006 Free Software
+   Foundation, Inc.
+
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -15,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.  */
 
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
 # include <config.h>
 #endif
 

diff --git a/lib/gettime.c b/lib/gettime.c
index d60711b533516fe3729225310e063dc0b2ec65e1..abef2c41e3f6259f1c92b9178e8d712062ec42ec 100644 (file)
--- a/lib/gettime.c
+++ b/lib/gettime.c
@@ -1,5 +1,6 @@
 /* gettime -- get the system clock
-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "timespec.h"
 

diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index eb6de94f1e302a660efa3a2c9d040d0df378af41..f2fad8cf41f83c96c39f1236940e08fd2a1c5fea 100644 (file)
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -2,7 +2,8 @@
    static buffer that localtime uses for it's return value.  The gettimeofday
    function from Mac OS X 10.0.4, i.e. Darwin 1.3.7 has this problem.
    The tzset replacement is necessary for at least Solaris 2.5, 2.5.1, and 2.6.
-   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+
+   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,9 +21,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Disable the definitions of these functions (from config.h)
    so we can use the library versions here.  */

diff --git a/lib/getugroups.c b/lib/getugroups.c
index dfcffd75fa52ec84b028b0d6c585c242f6dbd201..970192e6750b66b17b3aafbbf051e3b1042d81bf 100644 (file)
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -1,7 +1,7 @@
 /* getugroups.c -- return a list of the groups a user is in
 
-   Copyright (C) 1990, 1991, 1998, 1999, 2000, 2003, 2004, 2005 Free
-   Software Foundation.
+   Copyright (C) 1990, 1991, 1998, 1999, 2000, 2003, 2004, 2005, 2006
+   Free Software Foundation.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
 
 /* Written by David MacKenzie. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <sys/types.h>
 #include <stdio.h> /* grp.h on alpha OSF1 V2.0 uses "FILE *". */

diff --git a/lib/getusershell.c b/lib/getusershell.c
index a75d4fd4862d1f7b3077877058a9ec4a95f5f70d..6e7a443f12f26cfcea7d3173db0e9ba453c383ba 100644 (file)
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -19,9 +19,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #ifndef SHELLS_FILE
 # ifndef __DJGPP__

diff --git a/lib/glob.c b/lib/glob.c
index df0c5e2abbf3933b9b94c9af4ade563611b3382f..38927d388f735ef7ce9a50c22bfeec607bca7921 100644 (file)
--- a/lib/glob.c
+++ b/lib/glob.c
@@ -16,7 +16,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
 # include <config.h>
 #endif
 

diff --git a/lib/group-member.c b/lib/group-member.c
index 7b189f24100823969f8ce8d5f7efe51bbc7b11b0..018702655e923db55ade234002dd21d64b9d1e97 100644 (file)
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -1,5 +1,7 @@
 /* group-member.c -- determine whether group id is in calling user's group list
-   Copyright (C) 1994, 1997, 1998, 2003, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 1994, 1997, 1998, 2003, 2005, 2006 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "group-member.h"
 

diff --git a/lib/hard-locale.c b/lib/hard-locale.c
index 98530fcd5ea158e4ba27437b3459a550f1588c9b..ef3912698ef3cff5c0ab10ceb0c986cfa5d0f852 100644 (file)
--- a/lib/hard-locale.c
+++ b/lib/hard-locale.c
@@ -1,7 +1,7 @@
 /* hard-locale.c -- Determine whether a locale is hard.
 
-   Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004, 2006 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "hard-locale.h"
 

diff --git a/lib/hash-pjw.c b/lib/hash-pjw.c
index 315277abb227611d9dba33caf7746affc8569564..bd94036c4ce1de649b00cfdff0ecebc58f528050 100644 (file)
--- a/lib/hash-pjw.c
+++ b/lib/hash-pjw.c
@@ -1,5 +1,6 @@
 /* hash-pjw.c -- compute a hash value from a NUL-terminated string.
-   Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+   Copyright (C) 2001, 2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "hash-pjw.h"
 

diff --git a/lib/hash.c b/lib/hash.c
index f85bd519bf5a1d259de8dfb22fdff73df7c1b2d3..f4ab12f487de70ed85be317277df43d16176ce67 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -1,6 +1,6 @@
 /* hash - hashing table processing.
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free
    Software Foundation, Inc.
 
    Written by Jim Meyering, 1992.
@@ -24,9 +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!  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "hash.h"
 #include "xalloc.h"

diff --git a/lib/human.c b/lib/human.c
index ed15c6a24a3511f6699a15151f8d39a4ff4154a0..6e641446ceb782f9ccec055bae34e40a0ca3c59a 100644 (file)
--- a/lib/human.c
+++ b/lib/human.c
@@ -1,7 +1,7 @@
 /* human.c -- print human readable file size
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
 
 /* Written by Paul Eggert and Larry McVoy.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "human.h"
 

diff --git a/lib/idcache.c b/lib/idcache.c
index 2e46c1b047307af032e9654855c7fa13fbedb743..d4a867d7b9f5e84f3da4d5e1fab843219a8baa1e 100644 (file)
--- a/lib/idcache.c
+++ b/lib/idcache.c
@@ -1,7 +1,7 @@
 /* idcache.c -- map user and group IDs, cached for speed
 
-   Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998, 2003, 2005 Free
-   Software Foundation, Inc.
+   Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998, 2003, 2005, 2006
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c
index 8329c827dbc9042eb01912f0e47a21813deacbbf..537b59fa5c143bae5ec9a2f71afdcb4fdfa7d4e6 100644 (file)
--- a/lib/inet_ntop.c
+++ b/lib/inet_ntop.c
@@ -1,5 +1,6 @@
 /* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form
-   Copyright (c) 2005, 2006  Free Software Foundation, Inc.
+
+   Copyright (C) 2005, 2006  Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,9 +33,7 @@
  * SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "inet_ntop.h"

diff --git a/lib/inet_pton.c b/lib/inet_pton.c
index 39c08692b4f924395aa6740910bb77065e2c8278..5ec88a43acb7deb11f11ccb7a2704b4b60334a46 100644 (file)
--- a/lib/inet_pton.c
+++ b/lib/inet_pton.c
@@ -1,5 +1,6 @@
 /* inet_pton.c -- convert IPv4 and IPv6 addresses from text to binary form
-   Copyright (c) 2006  Free Software Foundation, Inc.
+
+   Copyright (C) 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,9 +33,7 @@
  * SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "inet_pton.h"

diff --git a/lib/inttostr.c b/lib/inttostr.c
index 2adcd2c131c21822518cf891678318219cc2314c..246d658350730a4c56d7c738c912def0952d7019 100644 (file)
--- a/lib/inttostr.c
+++ b/lib/inttostr.c
@@ -1,6 +1,6 @@
 /* inttostr.c -- convert integers to printable strings
 
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,8 @@
 
 /* Written by Paul Eggert */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
 #include "inttostr.h"
 
 /* Convert I to a printable string in BUF, which must be at least

diff --git a/lib/isdir.c b/lib/isdir.c
index 6a56a43d651afd617beb8637148df1cc329536f5..f328dbb6769703d723d95690f69e3c357ab64cac 100644 (file)
--- a/lib/isdir.c
+++ b/lib/isdir.c
@@ -1,5 +1,6 @@
 /* isdir.c -- determine whether a directory exists
-   Copyright (C) 1990, 1998 Free Software Foundation, Inc.
+
+   Copyright (C) 1990, 1998, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/lib/lchown.c b/lib/lchown.c
index 0b74eac8a95f6d573e69f15c7de6fe54878e58a5..f015cde9fc43560728c7ee10fa1241da8ff04f2f 100644 (file)
--- a/lib/lchown.c
+++ b/lib/lchown.c
@@ -1,5 +1,7 @@
 /* Provide a stub lchown function for systems that lack it.
-   Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation, Inc.
+
+   Copyright (C) 1998, 1999, 2002, 2004, 2006 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +19,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/lib/linebuffer.c b/lib/linebuffer.c
index 96d26bd9acc28a0d74dca9b402e4ff36c0f31687..3f1e45b285b077ff617fac3a096d846e2fef654a 100644 (file)
--- a/lib/linebuffer.c
+++ b/lib/linebuffer.c
@@ -1,6 +1,6 @@
 /* linebuffer.c -- read arbitrarily long lines
 
-   Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003, 2004 Free
+   Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003, 2004, 2006 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -18,10 +18,8 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Richard Stallman. */
-\f
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/lib/long-options.c b/lib/long-options.c
index 7c9972a19805bcb05cea0cb6caa800dcab417ba2..fb61661aacbbe58a59a62068953bfb26a2aa9b45 100644 (file)
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -1,7 +1,7 @@
 /* Utility to accept --help and --version options as unobtrusively as possible.
 
-   Copyright (C) 1993, 1994, 1998, 1999, 2000, 2002, 2003, 2004, 2005 Free
-   Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1998, 1999, 2000, 2002, 2003, 2004, 2005,
+   2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "long-options.h"

diff --git a/lib/lstat.c b/lib/lstat.c
index 9b9c33e415d9f015cf87d4e288a15e9f7ed5f943..bfa0d89b435a83aa6f651faeb00f88fcc1f06483 100644 (file)
--- a/lib/lstat.c
+++ b/lib/lstat.c
@@ -19,9 +19,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* 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 58fa6116824c2dfdd34754d367f9ac7cb4875940..d4dae3e182de32c4586304cc33c683f99c0b5f95 100644 (file)
--- a/lib/malloc.c
+++ b/lib/malloc.c
@@ -1,5 +1,6 @@
 /* malloc() function that is glibc compatible.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+
+   Copyright (C) 1997, 1998, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #undef malloc
 
 #include <stdlib.h>

diff --git a/lib/md5.c b/lib/md5.c
index 043a741d50ce14e42961db16522e19270a90d1ad..917a899a7b6d76cf2ccb3e867962be267f16de83 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -20,9 +20,7 @@
 
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "md5.h"
 

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

diff --git a/lib/memchr.c b/lib/memchr.c
index 3c5ecfd0e10b1dcc32f149fe0a92d4194dedfd35..d44ad6deb516dbaf70c8a7dcd147cd3f14e04ec2 100644 (file)
--- a/lib/memchr.c
+++ b/lib/memchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004 Free
+/* Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2006 Free
    Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software Foundation,
 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
 # include <config.h>
 #endif
 

diff --git a/lib/memcmp.c b/lib/memcmp.c
index 6928b1e4a04de89487b489109ece44917f48e979..cf98bfab16432c3cee103e4d7b64425c9844ea38 100644 (file)
--- a/lib/memcmp.c
+++ b/lib/memcmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1995, 1997, 1998, 2003 Free Software
+/* Copyright (C) 1991, 1993, 1995, 1997, 1998, 2003, 2006 Free Software
    Foundation, Inc.
 
    Contributed by Torbjorn Granlund (tege@sics.se).
@@ -21,7 +21,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
 # include <config.h>
 #endif
 

diff --git a/lib/memcoll.c b/lib/memcoll.c
index 457d1104a93c9093d67875e123fcff1a850b7273..e5ef36397b6a5af2b9361ff71fb42064c2e25947 100644 (file)
--- a/lib/memcoll.c
+++ b/lib/memcoll.c
@@ -1,5 +1,6 @@
 /* Locale-specific memory comparison.
-   Copyright (C) 1999, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+   Copyright (C) 1999, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Contributed by Paul Eggert <eggert@twinsun.com>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "memcoll.h"
 

diff --git a/lib/memcpy.c b/lib/memcpy.c
index 2ab5ed6ee78c77dee4f51d3f36f4b325c32d8148..d1e49c6fc762ce634ff2838313d4f3655b301af5 100644 (file)
--- a/lib/memcpy.c
+++ b/lib/memcpy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1997, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1997, 2000, 2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,9 +16,7 @@
 
 /* Written by Jim Meyering <meyering@na-net.ornl.gov>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stddef.h>
 

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

diff --git a/lib/memrchr.c b/lib/memrchr.c
index 0b6659fd92a053e5a5e91ad4805e30b5dea535ed..471511c57f5f21d0b4f069c47240dea81900d9e5 100644 (file)
--- a/lib/memrchr.c
+++ b/lib/memrchr.c
@@ -1,7 +1,7 @@
 /* memrchr -- find the last occurrence of a byte in a memory block
 
-   Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2005,
+   2006 Free Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
    with help from Dan Sahlin (dan@sics.se) and
@@ -23,14 +23,11 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #if defined _LIBC
 # include <string.h>
 # include <memcopy.h>
 #else
+# include <config.h>
 # include "memrchr.h"
 # define reg_char char
 #endif

diff --git a/lib/mkancesdirs.c b/lib/mkancesdirs.c
index 4737742366806f6a13741467f6dd5202213e2c39..3db352d325d73926ab32faac4614b467a1fdc3af 100644 (file)
--- a/lib/mkancesdirs.c
+++ b/lib/mkancesdirs.c
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "mkancesdirs.h"
 

diff --git a/lib/mkdir-p.c b/lib/mkdir-p.c
index 697de7768cc26fa645626031f6d565716550b795..3838c8e9ad16a4972326573b5cec8d328b4c1fc4 100644 (file)
--- a/lib/mkdir-p.c
+++ b/lib/mkdir-p.c
@@ -19,9 +19,7 @@
 
 /* Written by Paul Eggert, David MacKenzie, and Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "mkdir-p.h"
 

diff --git a/lib/mkdir.c b/lib/mkdir.c
index c921ecfdb4bf627a32c2d75a47d2acac1666b306..5a0c4b03347d40ce56553148cf0dec88e9ac150c 100644 (file)
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -1,7 +1,7 @@
 /* On some systems, mkdir ("foo/", 0700) fails because of the trailing
    slash.  On those systems, this wrapper removes the trailing slash.
 
-   Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* 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/mkdirat.c b/lib/mkdirat.c
index dc75eb12e82d453c45d7e1a1491fd44664b9f050..da0b262bf60919563ef10149d6af8786950749df 100644 (file)
--- a/lib/mkdirat.c
+++ b/lib/mkdirat.c
@@ -17,9 +17,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "openat.h"
 

diff --git a/lib/mkstemp-safer.c b/lib/mkstemp-safer.c
index 315385da0e32c382300f43bce59bfab3cc7c17f4..47d015a492356279a129af1e123533e51c40ff9a 100644 (file)
--- a/lib/mkstemp-safer.c
+++ b/lib/mkstemp-safer.c
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "stdlib-safer.h"
 

diff --git a/lib/mkstemp.c b/lib/mkstemp.c
index cec5ba8bac873eb563cf35a33b8d770c0c41f356..32f2de40bd2bf5857113bf9b17d17fcfe9012139 100644 (file)
--- a/lib/mkstemp.c
+++ b/lib/mkstemp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2001, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2001, 2005, 2006 Free Software Foundation, Inc.
    This file is derived from the one in the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -15,9 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* 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 80e06710ac624c7eaad72ee10e95e887aa2fe20d..e1f7ceb77c02280bfdb0e8e296ec117c34299a41 100644 (file)
--- a/lib/modechange.c
+++ b/lib/modechange.c
@@ -26,9 +26,7 @@
    changing the mode of many files, this probably results in a
    performance gain.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "modechange.h"
 #include <sys/stat.h>

diff --git a/lib/mountlist.c b/lib/mountlist.c
index 285c3de5e7c391f71b9f4a5f7f89956b365d2bcf..d70a1a20816c8e87a783d548994c6054a5586ff0 100644 (file)
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "mountlist.h"
 

diff --git a/lib/nanosleep.c b/lib/nanosleep.c
index 9d725c66d9cf6ed1c6b3f0b36186eca650fcc1cb..fe22a97cabac69e955e2c10c6575e71e571f4716 100644 (file)
--- a/lib/nanosleep.c
+++ b/lib/nanosleep.c
@@ -19,9 +19,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* 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/obstack.c b/lib/obstack.c
index 9c4aaaf636a841bea4cbdf78ab4b38a830ba573e..1bbf62bb65e66a8351d0cb39a4c187cf1ed84302 100644 (file)
--- a/lib/obstack.c
+++ b/lib/obstack.c
@@ -18,14 +18,11 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifdef _LIBC
 # include <obstack.h>
 # include <shlib-compat.h>
 #else
+# include <config.h>
 # include "obstack.h"
 #endif
 

diff --git a/lib/open-safer.c b/lib/open-safer.c
index d3ba894ac7bc0be60822184e7e7b4cf85d09a335..04a72eb7b6c93063150cbcde2593d0b0200747c2 100644 (file)
--- a/lib/open-safer.c
+++ b/lib/open-safer.c
@@ -1,5 +1,6 @@
 /* Invoke open, but avoid some glitches.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "fcntl-safer.h"
 

diff --git a/lib/openat-die.c b/lib/openat-die.c
index e274ff6e1b0e4c9935fc91aabe162e45dc4d6e78..7a285700d5c9a7b68bbb9fb563f4ffb2e7bf8619 100644 (file)
--- a/lib/openat-die.c
+++ b/lib/openat-die.c
@@ -1,6 +1,6 @@
 /* Report a save- or restore-cwd failure in our openat replacement and then exit.
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdlib.h>
 

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

diff --git a/lib/pagealign_alloc.c b/lib/pagealign_alloc.c
index 45bbd65732d8c42f52a94f526f9569f75348a8b1..521bde5660042445431f03d2a8c7711ed2b7805f 100644 (file)
--- a/lib/pagealign_alloc.c
+++ b/lib/pagealign_alloc.c
@@ -1,6 +1,6 @@
 /* Memory allocation aligned to system page boundaries.
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -19,9 +19,7 @@
 
 /* Written by Derek R. Price <derek@ximbiot.com>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "pagealign_alloc.h"
 

diff --git a/lib/physmem.c b/lib/physmem.c
index ad8594d2890764a1709baf05586c767bf32a12ff..844817bf0a98e2fd28ef3baa17c8808b86867185 100644 (file)
--- a/lib/physmem.c
+++ b/lib/physmem.c
@@ -1,5 +1,7 @@
 /* Calculate the size of physical memory.
-   Copyright (C) 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2000, 2001, 2003, 2005, 2006 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +19,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "physmem.h"
 
@@ -300,6 +300,6 @@ main (void)
 
 /*
 Local Variables:
-compile-command: "gcc -DDEBUG -DHAVE_CONFIG_H -I.. -g -O -Wall -W physmem.c"
+compile-command: "gcc -DDEBUG -g -O -Wall -W physmem.c"
 End:
 */

diff --git a/lib/pipe-safer.c b/lib/pipe-safer.c
index 81df994545557d6ace231108d4b0581f2679090e..e4431b33a47961095d348a20a59535ddb7f20e10 100644 (file)
--- a/lib/pipe-safer.c
+++ b/lib/pipe-safer.c
@@ -17,9 +17,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "unistd-safer.h"
 

diff --git a/lib/posixtm.c b/lib/posixtm.c
index 43161d2e0eca81616643a69061876b5c3a3e4467..5a839d6765d221367784bb74f35a60b44cdfb1c1 100644 (file)
--- a/lib/posixtm.c
+++ b/lib/posixtm.c
@@ -1,7 +1,7 @@
 /* Parse dates for touch and date.
 
-   Copyright (C) 1989, 1990, 1991, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation Inc.
+   Copyright (C) 1989, 1990, 1991, 1998, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006 Free Software Foundation Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,9 +20,7 @@
 /* Yacc-based version written by Jim Kingdon and David MacKenzie.
    Rewritten by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdbool.h>
 
@@ -333,6 +331,6 @@ main (void)
 \f
 /*
 Local Variables:
-compile-command: "gcc -DTEST_POSIXTIME -DHAVE_CONFIG_H -I.. -g -O -Wall -W posixtm.c"
+compile-command: "gcc -DTEST_POSIXTIME -g -O -Wall -W posixtm.c"
 End:
 */

diff --git a/lib/posixver.c b/lib/posixver.c
index 0e75676f9691e1afa2f60b6606836cc2bb2d063d..e7b4699783c622cf504e1cb12390d264bdc1a41b 100644 (file)
--- a/lib/posixver.c
+++ b/lib/posixver.c
@@ -1,6 +1,7 @@
 /* Which POSIX version to conform to, for utilities.
 
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +19,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "posixver.h"
 

diff --git a/lib/putenv.c b/lib/putenv.c
index 9c7cf66eeff7011c5e7a0c40ce5046624fbf334d..d90401618c17a71e1d64a0def3999a572a3fb43b 100644 (file)
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991, 1994, 1997, 1998, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1997, 1998, 2000, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.
@@ -17,9 +18,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stddef.h>
 

diff --git a/lib/quote.c b/lib/quote.c
index 70f1d1d757a4eee2335b190da4fb1134e5aad4f9..119be72ae0abecf43c1fe777c92bf9afe9be26e5 100644 (file)
--- a/lib/quote.c
+++ b/lib/quote.c
@@ -1,5 +1,7 @@
 /* quote.c - quote arguments for output
-   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2006 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +19,7 @@
 
 /* Written by Paul Eggert <eggert@twinsun.com> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "quotearg.h"
 #include "quote.h"

diff --git a/lib/quotearg.c b/lib/quotearg.c
index 113239fb14f06eb1c95c2eac76b2ef1be47bf8e8..381f00acc13cc41bb3ed293f82d4788f117fa75f 100644 (file)
--- a/lib/quotearg.c
+++ b/lib/quotearg.c
@@ -19,9 +19,7 @@
 
 /* Written by Paul Eggert <eggert@twinsun.com> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "quotearg.h"
 

diff --git a/lib/raise.c b/lib/raise.c
index 0c1464064a42dd61980dd691bee453db1e44319e..98a97da6de24b66a2cdc2132a91fcdc969c9d29f 100644 (file)
--- a/lib/raise.c
+++ b/lib/raise.c
@@ -1,5 +1,6 @@
 /* Provide a non-threads replacement for the POSIX raise function.
-   Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <sys/types.h>
 #include <signal.h>

diff --git a/lib/readtokens.c b/lib/readtokens.c
index c3525524fdd60d26ef33a8450cbbfd0d8cc18466..28aafa96200fdb9a49148ff6698e985549f9bf98 100644 (file)
--- a/lib/readtokens.c
+++ b/lib/readtokens.c
@@ -1,5 +1,6 @@
 /* readtokens.c  -- Functions for reading tokens from an input stream.
-   Copyright (C) 1990-1991, 1999-2004 Free Software Foundation, Inc.
+
+   Copyright (C) 1990-1991, 1999-2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,9 +22,7 @@
    gives the same functionality, except that these functions
    would never return empty lines. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "readtokens.h"
 

diff --git a/lib/readtokens0.c b/lib/readtokens0.c
index 55b39a747f58c74ce5db113575901e9f571e74b1..b60fd5a4478d9a2a8777cb75280a5e681adf482c 100644 (file)
--- a/lib/readtokens0.c
+++ b/lib/readtokens0.c
@@ -1,5 +1,6 @@
 /* readtokens0.c -- Read NUL-separated tokens from an input stream.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,8 @@
 
    Written by Jim Meyering. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
 #include <stdlib.h>
 
 #include "readtokens0.h"

diff --git a/lib/readutmp.c b/lib/readutmp.c
index 634d9ab1ffd6d364e6e0aab2babcd5de9468b88d..cf29572f093ee28629c268cd15e0ad399dd239cf 100644 (file)
--- a/lib/readutmp.c
+++ b/lib/readutmp.c
@@ -1,5 +1,7 @@
 /* GNU's read utmp module.
-   Copyright (C) 1992-2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 1992-2001, 2003, 2004, 2005, 2006 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +19,7 @@
 
 /* Written by jla; revised by djm */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "readutmp.h"
 

diff --git a/lib/realloc.c b/lib/realloc.c
index fe94822238b30f956315a10506addcaa37117ca8..c1fe9e5a18752d8cf36958614fb66ea7517bfefe 100644 (file)
--- a/lib/realloc.c
+++ b/lib/realloc.c
@@ -1,5 +1,6 @@
 /* realloc() function that is glibc compatible.
-   Copyright (C) 1997, 2003, 2004 Free Software Foundation, Inc.
+
+   Copyright (C) 1997, 2003, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #undef realloc
 
 #include <stdlib.h>

diff --git a/lib/regex.c b/lib/regex.c
index 70ee70ecba1261b2e6605ff120251a55f246889a..d4eb726b295313342c08c28f45986c8afaf1a72d 100644 (file)
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -17,9 +17,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Make sure noone compiles this code with a C++ compiler.  */
 #if defined __cplusplus && defined _LIBC

diff --git a/lib/rename.c b/lib/rename.c
index 9c9e7f4dff98e0744e43965456afdc26500b4e6b..32d2b0131764df0aa209080294e689eb1962993c 100644 (file)
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -1,7 +1,8 @@
 /* Work around the bug in some systems whereby rename fails when the source
    file has a trailing slash.  The rename functions of SunOS 4.1.1_U1 and
    mips-dec-ultrix4.4 have this bug.
-   Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +20,7 @@
 
 /* written by Volker Borchert */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #undef rename
 
 #include <stdio.h>

diff --git a/lib/rmdir.c b/lib/rmdir.c
index 25564b6b4891e3cfe653ea4b25e7eebfc8a4037b..1cc74395a4436d69bd5feb4841910503ea5dd633 100644 (file)
--- a/lib/rmdir.c
+++ b/lib/rmdir.c
@@ -1,7 +1,7 @@
 /* BSD compatible remove directory function for System V
 
-   Copyright (C) 1988, 1990, 1999, 2003, 2004, 2005 Free Software
-   Foundation, Inc.
+   Copyright (C) 1988, 1990, 1999, 2003, 2004, 2005, 2006 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index ba8bc4ce93925e753448120035e3137f41c2c6d9..e5f79f8228a34329ce20a4130e49b57b56e8e759 100644 (file)
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -1,6 +1,8 @@
 /* Determine whether string value is affirmation or negative response
    according to current locale's data.
-   Copyright (C) 1996, 1998, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+   Copyright (C) 1996, 1998, 2000, 2002, 2003, 2006 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,9 +18,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stddef.h>
 #include <stdlib.h>

diff --git a/lib/safe-read.c b/lib/safe-read.c
index 9caf84666d40f2ac0ad938f7d8890f9d80e4c938..b7bf1d5cd60ef2cf12de123820a17d147af6a7c2 100644 (file)
--- a/lib/safe-read.c
+++ b/lib/safe-read.c
@@ -1,7 +1,7 @@
 /* An interface to read and write that retries after interrupts.
 
-   Copyright (C) 1993, 1994, 1998, 2002, 2003, 2004, 2005 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1994, 1998, 2002, 2003, 2004, 2005, 2006 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #ifdef SAFE_WRITE

diff --git a/lib/same.c b/lib/same.c
index e267ba4442435525a83b90437ec4a1a665d11119..11590c683206b008895c6c5dc4df85ea727626e3 100644 (file)
--- a/lib/same.c
+++ b/lib/same.c
@@ -19,9 +19,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/lib/save-cwd.c b/lib/save-cwd.c
index f842ccafc75623dc8184fd712f53e4b67c52379a..f07973a3ab3fafe2df657c5c526c44922861a324 100644 (file)
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -1,7 +1,7 @@
 /* save-cwd.c -- Save and restore current working directory.
 
-   Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005, 2006 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "save-cwd.h"
 

diff --git a/lib/savedir.c b/lib/savedir.c
index 3c442aa6e71f67dfe2067fde1d6b1ce5d21f9266..12084ee90bc098554b8ee1e5d3a41d571fdfe250 100644 (file)
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -19,9 +19,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "savedir.h"
 

diff --git a/lib/setenv.c b/lib/setenv.c
index 335d1d2f9a73280fe01ed0c40a6966eaac80a269..23832485a9f27a0adb3d1e207ad2da873d523c56 100644 (file)
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2003,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2003,2005,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -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. */
 
-#ifdef HAVE_CONFIG_H
+#if !_LIBC
 # include <config.h>
 #endif
 #include <alloca.h>

diff --git a/lib/settime.c b/lib/settime.c
index 1d40987305e4abf30b4a0d5819ed0614f5b7aa5b..9d48f1654fc35a8b4314553ca9a619ae2071c17c 100644 (file)
--- a/lib/settime.c
+++ b/lib/settime.c
@@ -1,5 +1,6 @@
 /* settime -- set the system clock
-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "timespec.h"
 

diff --git a/lib/sha1.c b/lib/sha1.c
index dadf97361e90a5cfec73590613809520f4edcc8b..035f898c71f1dae4fab2ed3c48ef125be0e66b5d 100644 (file)
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -23,9 +23,7 @@
       Robert Klep <robert@ilse.nl>  -- Expansion function fix
 */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "sha1.h"
 

diff --git a/lib/sig2str.c b/lib/sig2str.c
index bf4b7cbe8bfe32e70a753f5d746c3a5cfd820854..cf2819daab7d487490be4f4bfe38deade1e59ba3 100644 (file)
--- a/lib/sig2str.c
+++ b/lib/sig2str.c
@@ -1,6 +1,6 @@
 /* sig2str.c -- convert between signal names and numbers
 
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <limits.h>
 #include <signal.h>

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

diff --git a/lib/strdup.c b/lib/strdup.c
index d6d011620445713028b812854ae324c4685489c6..7cff51be098deb0b5cc87f365356fb2ad0ba6574 100644 (file)
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004, 2006 Free
+   Software Foundation, Inc.
 
    This file is part of the GNU C Library.
 
@@ -17,11 +17,8 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifndef _LIBC
+# include <config.h>
 /* Get specification.  */
 # include "strdup.h"
 #endif

diff --git a/lib/strerror.c b/lib/strerror.c
index 623821d2e3d50b6df1754707a12c8ae94dc83c00..24e2e1ba7804471c9caef146d14aa8f2f93e67e7 100644 (file)
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -1,7 +1,7 @@
 /* strerror.c --- ANSI C compatible system error routine
 
-   Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003 Free Software
-   Foundation, Inc.
+   Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003, 2006 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <limits.h>
 

diff --git a/lib/strftime.c b/lib/strftime.c
index 4a4ac06627ecc2e59d4f9ec3e7190d200de5d874..86cd1cf7e7082ef78d6dcd070c8f3719e52cb145 100644 (file)
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -18,10 +18,6 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifdef _LIBC
 # define HAVE_MBLEN 1
 # define HAVE_MBRLEN 1
@@ -32,6 +28,8 @@
 # define HAVE_TZSET 1
 # define MULTIBYTE_IS_FORMAT_SAFE 1
 # include "../locale/localeinfo.h"
+#else
+# include <config.h>
 #endif
 
 #include <ctype.h>

diff --git a/lib/stripslash.c b/lib/stripslash.c
index 4ba5dadbe8b6f0c13108892cd8cad9ee043c3019..342d497c89930cbbcc6e55ec7e1ab11853d7a229 100644 (file)
--- a/lib/stripslash.c
+++ b/lib/stripslash.c
@@ -16,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "dirname.h"
 

diff --git a/lib/strndup.c b/lib/strndup.c
index 2626373f263a2fe5c113a344993b14c6a924e8ce..55cb5603616b47dc43a3bb39ac1d6eb68ec40e0f 100644 (file)
--- a/lib/strndup.c
+++ b/lib/strndup.c
@@ -18,10 +18,8 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #if !_LIBC
+# include <config.h>
 # include "strndup.h"
 #endif
 

diff --git a/lib/strnlen.c b/lib/strnlen.c
index 09ba788ab033db570e91b5f130b2418dc7641f34..593fd1b7c8c149cb2d7c9fb98ca83315d1ff403f 100644 (file)
--- a/lib/strnlen.c
+++ b/lib/strnlen.c
@@ -16,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "strnlen.h"
 

diff --git a/lib/strpbrk.c b/lib/strpbrk.c
index 9152440b1e9d3826915898315523283cda9c5dfa..7843a6dd6a8295925c09ac2aad2006538b187aa6 100644 (file)
--- a/lib/strpbrk.c
+++ b/lib/strpbrk.c
@@ -1,4 +1,6 @@
-/* Copyright (C) 1991, 1994, 2000, 2002-2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006 Free Software
+   Foundation, Inc.
+
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
@@ -16,9 +18,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stddef.h>
 #include <string.h>

diff --git a/lib/strtod.c b/lib/strtod.c
index 73f01f974a4ae55cfaca491c717965b96065858c..fdfc09f1bc0ca61909db5116774e57d134d5b896 100644 (file)
--- a/lib/strtod.c
+++ b/lib/strtod.c
@@ -14,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <errno.h>
 

diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index dcdd1810c348ba825f6d4b8f87eb522c8820baff..f1828b11f145ffbf144087d52a4f716b75c6058b 100644 (file)
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -19,9 +19,7 @@
 
 /* Written by Paul Eggert. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Verify interface.  */
 #include <inttypes.h>

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

diff --git a/lib/strverscmp.c b/lib/strverscmp.c
index 5361a5cc507e9f0cafa058a54d7ef928b6d5bab0..f0776516f106cd0f79f8b53e04727f5e70629c4d 100644 (file)
--- a/lib/strverscmp.c
+++ b/lib/strverscmp.c
@@ -1,5 +1,5 @@
 /* Compare strings while treating digits characters numerically.
-   Copyright (C) 1997, 2000, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000, 2002, 2004, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
 
@@ -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.  */
 
-#ifdef HAVE_CONFIG_H
+#if !_LIBC
 # include <config.h>
 #endif
 

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

diff --git a/lib/time_r.c b/lib/time_r.c
index 412006372fa614c447fcdd79aaa915f39883db9a..3205862adf027cb77db0bafdf633892f824b77a3 100644 (file)
--- a/lib/time_r.c
+++ b/lib/time_r.c
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "time_r.h"
 

diff --git a/lib/timegm.c b/lib/timegm.c
index 82f904a6bfeff035e23a949c88745d46662a89e6..656df1c95494f3441b4054d025df482966962e5e 100644 (file)
--- a/lib/timegm.c
+++ b/lib/timegm.c
@@ -1,7 +1,7 @@
 /* Convert UTC calendar time to simple time.  Like mktime but assumes UTC.
 
-   Copyright (C) 1994, 1997, 2003, 2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
+   Copyright (C) 1994, 1997, 2003, 2004, 2006 Free Software
+   Foundation, Inc.  This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,13 +17,10 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifdef _LIBC
 # include <time.h>
 #else
+# include <config.h>
 # include "timegm.h"
 # include <time_r.h>
 # undef __gmtime_r

diff --git a/lib/tmpfile-safer.c b/lib/tmpfile-safer.c
index 74ab959140e2e12f2e29428afcc5c328a07f1723..cd8dddf4cfa70ef14df900d950af697d82935f4e 100644 (file)
--- a/lib/tmpfile-safer.c
+++ b/lib/tmpfile-safer.c
@@ -17,9 +17,7 @@
 
 /* Written by Eric Blake, based on ideas from Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "stdio-safer.h"
 

diff --git a/lib/unlinkdir.c b/lib/unlinkdir.c
index d3584bebfb2609155882d85c71513764e0b92905..07620dbf0516ba9e60ef935fe74e1f12d41a8652 100644 (file)
--- a/lib/unlinkdir.c
+++ b/lib/unlinkdir.c
@@ -1,6 +1,6 @@
 /* unlinkdir.c - determine (and maybe change) whether we can unlink directories
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert and Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "unlinkdir.h"
 

diff --git a/lib/userspec.c b/lib/userspec.c
index fd2c941f81d9b3d3ffbe05ad0d1265c532028462..4dbaee0a36823c354f491155ce922edec3baea38 100644 (file)
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -18,9 +18,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "userspec.h"

diff --git a/lib/utime.c b/lib/utime.c
index 906cec8d7900f77186961e9e2f19836400f71210..421a7cc58e1b0d075a1a96bde06953e5401961dc 100644 (file)
--- a/lib/utime.c
+++ b/lib/utime.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2001, 2002, 2003, 2004, 2006 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -16,9 +17,7 @@
 
 /* derived from a function in touch.c */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #undef utime
 
 #include <sys/types.h>

diff --git a/lib/utimecmp.c b/lib/utimecmp.c
index b42e71fa83238ac37f093239d5b69db44fef9519..5be050a9440ff9d4eb162ad4621f56f3a37ac56f 100644 (file)
--- a/lib/utimecmp.c
+++ b/lib/utimecmp.c
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "utimecmp.h"
 

diff --git a/lib/utimens.c b/lib/utimens.c
index 1489df05caeb0752acdf92a4cafef59aa56ae51f..e3daaf3f542be3621e8a049fca68b76ffe22f138 100644 (file)
--- a/lib/utimens.c
+++ b/lib/utimens.c
@@ -20,9 +20,7 @@
 
 /* derived from a function in touch.c */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "utimens.h"
 

diff --git a/lib/version-etc-fsf.c b/lib/version-etc-fsf.c
index 374100563fb8455b7401b30b5076fd7988ee1566..f25eb653ea0f128082095eee32d7e4b382a5a5d6 100644 (file)
--- a/lib/version-etc-fsf.c
+++ b/lib/version-etc-fsf.c
@@ -1,5 +1,5 @@
 /* Variable with FSF copyright information, for version-etc.
-   Copyright (C) 1999-2005 Free Software Foundation, Inc.
+   Copyright (C) 1999-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
 
 /* Written by Jim Meyering. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "version-etc.h"

diff --git a/lib/version-etc.c b/lib/version-etc.c
index 7887c26e217610fa1025b398e4c33b849f7fa144..10d33faa6e3b5bb0868fd01bc02cabb3cb9c434e 100644 (file)
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -17,9 +17,7 @@
 
 /* Written by Jim Meyering. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "version-etc.h"

diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c
index 9b4a76c6ba484aab489548c05fd026627ac7eac1..090f060df78402530435928f0341ac0282659f9d 100644 (file)
--- a/lib/xalloc-die.c
+++ b/lib/xalloc-die.c
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xalloc.h"
 

diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c
index 0f798dac066d71b75e5a5b9d7f5d75e0c1367944..db5f2d217d43d4914d22027fede8b02cb43759f8 100644 (file)
--- a/lib/xgetcwd.c
+++ b/lib/xgetcwd.c
@@ -1,6 +1,6 @@
 /* xgetcwd.c -- return current directory with unlimited length
 
-   Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xgetcwd.h"
 

diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index 656ef410132f6b9b0ff897fcf349f1073e3fd806..b4c8dcc7328055a40735c4d6d9c79b6829e61d8e 100644 (file)
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -1,7 +1,7 @@
 /* xgethostname.c -- return current hostname with unlimited length
 
-   Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004, 2005 Free Software
-   Foundation, Inc.
+   Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004, 2005, 2006 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "xgethostname.h"

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 687633c250cfeee9eaa1e9227feec92d1281612f..fe84a0b4903408d59cef105a658f8e4a8da4ae76 100644 (file)
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -1,7 +1,8 @@
 /* xmalloc.c -- malloc with out of memory checking
 
    Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+   Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xalloc.h"
 

diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c
index f04e468d8fb55bcd930080f9d1ec8f7f39c770e7..de00c84447a8d5e6e4f53808f2008453e77a6684 100644 (file)
--- a/lib/xmemcoll.c
+++ b/lib/xmemcoll.c
@@ -1,5 +1,6 @@
 /* Locale-specific memory comparison.
-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+
+   Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Contributed by Paul Eggert <eggert@twinsun.com>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <errno.h>
 #include <stdlib.h>

diff --git a/lib/xnanosleep.c b/lib/xnanosleep.c
index bab58eecb4e9b98e49f65b40c076ca592374933a..70c7f2a37f9a3a5cd75e6f8af7b333d7f4b9de9b 100644 (file)
--- a/lib/xnanosleep.c
+++ b/lib/xnanosleep.c
@@ -1,5 +1,6 @@
 /* xnanosleep.c -- a more convenient interface to nanosleep
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +19,7 @@
 /* Mostly written (for sleep.c) by Paul Eggert.
    Factored out (creating this file) by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xnanosleep.h"
 

diff --git a/lib/xreadlink.c b/lib/xreadlink.c
index b8bb3c4dfbe366f937f88b7ec6ce1107dbdab1a3..8d61b633a779c3f5b991ff6ed3c45d402fdba2ef 100644 (file)
--- a/lib/xreadlink.c
+++ b/lib/xreadlink.c
@@ -1,6 +1,7 @@
 /* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
 
-   Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +20,7 @@
 
 /* Written by Jim Meyering <jim@meyering.net>  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xreadlink.h"
 

diff --git a/lib/xstrtod.c b/lib/xstrtod.c
index e711ec860bcc1ac9b5639308f48045c15eda2d81..86e124f2093a43b2719620be6ca8d5762981c742 100644 (file)
--- a/lib/xstrtod.c
+++ b/lib/xstrtod.c
@@ -19,9 +19,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xstrtod.h"
 

diff --git a/lib/xstrtoimax.c b/lib/xstrtoimax.c
index 3e585d6e00f21585ba57a01de7e79cfcd16addbe..37b30d886d293c8a57e48192bcee3ff13181c04d 100644 (file)
--- a/lib/xstrtoimax.c
+++ b/lib/xstrtoimax.c
@@ -1,5 +1,6 @@
 /* xstrtoimax.c -- A more useful interface to strtoimax.
-   Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+
+   Copyright (C) 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Cloned by Jim Meyering. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xstrtol.h"
 

diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index e7fb0681050bd659d53505bf95533b30d32ad755..2d1ba91543b14d271ae1b32b893e67e22edde94b 100644 (file)
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -19,9 +19,7 @@
 
 /* Written by Jim Meyering. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xstrtol.h"
 

diff --git a/lib/xstrtoumax.c b/lib/xstrtoumax.c
index e6208a4740ea116b4f097e8d82a2eec9645adb1b..6fb35c7525a1bc25e42dde1140f296a729822265 100644 (file)
--- a/lib/xstrtoumax.c
+++ b/lib/xstrtoumax.c
@@ -1,5 +1,6 @@
 /* xstrtoumax.c -- A more useful interface to strtoumax.
-   Copyright (C) 1999, 2003, 2004 Free Software Foundation, Inc.
+
+   Copyright (C) 1999, 2003, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Written by Paul Eggert. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xstrtol.h"
 

diff --git a/lib/yesno.c b/lib/yesno.c
index a364a1b18dd9ec0a7e001d2120086b17453d9e8f..930bfb0a71f0057d1ff19d69e6c74910411adda9 100644 (file)
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -1,7 +1,7 @@
 /* yesno.c -- read a yes/no response from stdin
 
-   Copyright (C) 1990, 1998, 2001, 2003, 2004, 2005 Free Software
-   Foundation, Inc.
+   Copyright (C) 1990, 1998, 2001, 2003, 2004, 2005, 2006 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "yesno.h"