bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

removed many uses of HAVE_CONFIG_H from gnulib


From: Paul Eggert
Subject: removed many uses of HAVE_CONFIG_H from gnulib
Date: Wed, 13 Sep 2006 15:41:51 -0700
User-agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux)

coreutils uses the config-h module, so its lib/* files differ slightly
from gnulib, since "#ifdef HAVE_CONFIG_H" is replaced with "#if 1".
This makes it inconvenient to debug in coreutils, since I constantly
have to remember to change the #if back and forth.  Since nobody needs
HAVE_CONFIG_H any more, I installed the following change into gnulib.
At some point I'll ask this to be done for other modules, but I
thought I'd try these out for now, as guinea pigs.

If this is a real problem for anybody (which I think it won't be),
we can define a new no-config-h module which reverses the change.

2006-09-13  Paul Eggert  <address@hidden>

        * _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.

Index: lib/__fpending.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/__fpending.c,v
retrieving revision 1.8
diff -p -u -r1.8 __fpending.c
--- lib/__fpending.c    19 Sep 2005 17:28:14 -0000      1.8
+++ lib/__fpending.c    13 Sep 2006 22:29:16 -0000
@@ -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"
 
Index: lib/acl.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/acl.c,v
retrieving revision 1.6
diff -p -u -r1.6 acl.c
--- lib/acl.c   9 Jan 2006 23:13:56 -0000       1.6
+++ lib/acl.c   13 Sep 2006 22:29:16 -0000
@@ -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>
Index: lib/alloca.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/alloca.c,v
retrieving revision 1.14
diff -p -u -r1.14 alloca.c
--- lib/alloca.c        17 May 2004 05:41:42 -0000      1.14
+++ lib/alloca.c        13 Sep 2006 22:29:16 -0000
@@ -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>
 
Index: lib/argmatch.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/argmatch.c,v
retrieving revision 1.39
diff -p -u -r1.39 argmatch.c
--- lib/argmatch.c      19 Sep 2005 17:28:14 -0000      1.39
+++ lib/argmatch.c      13 Sep 2006 22:29:16 -0000
@@ -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 <address@hidden>
    Modified by Akim Demaille <address@hidden> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "argmatch.h"
Index: lib/atexit.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/atexit.c,v
retrieving revision 1.4
diff -p -u -r1.4 atexit.c
--- lib/atexit.c        19 Sep 2005 17:28:14 -0000      1.4
+++ lib/atexit.c        13 Sep 2006 22:29:16 -0000
@@ -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))
Index: lib/backupfile.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/backupfile.c,v
retrieving revision 1.51
diff -p -u -r1.51 backupfile.c
--- lib/backupfile.c    11 Jul 2006 06:02:51 -0000      1.51
+++ lib/backupfile.c    13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/basename.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/basename.c,v
retrieving revision 1.27
diff -p -u -r1.27 basename.c
--- lib/basename.c      3 Jul 2006 08:32:46 -0000       1.27
+++ lib/basename.c      13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/c-stack.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/c-stack.c,v
retrieving revision 1.8
diff -p -u -r1.8 c-stack.c
--- lib/c-stack.c       8 Mar 2006 01:37:15 -0000       1.8
+++ lib/c-stack.c       13 Sep 2006 22:29:17 -0000
@@ -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)),

 /*
 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:
 */
Index: lib/c-strtod.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/c-strtod.c,v
retrieving revision 1.5
diff -p -u -r1.5 c-strtod.c
--- lib/c-strtod.c      14 May 2005 06:03:57 -0000      1.5
+++ lib/c-strtod.c      13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/calloc.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/calloc.c,v
retrieving revision 1.5
diff -p -u -r1.5 calloc.c
--- lib/calloc.c        19 Sep 2005 17:28:14 -0000      1.5
+++ lib/calloc.c        13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/canon-host.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/canon-host.c,v
retrieving revision 1.21
diff -p -u -r1.21 canon-host.c
--- lib/canon-host.c    13 Sep 2005 13:23:57 -0000      1.21
+++ lib/canon-host.c    13 Sep 2006 22:29:17 -0000
@@ -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 <address@hidden>.
 
@@ -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"
 
Index: lib/canonicalize.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/canonicalize.c,v
retrieving revision 1.6
diff -p -u -r1.6 canonicalize.c
--- lib/canonicalize.c  23 Sep 2005 04:15:13 -0000      1.6
+++ lib/canonicalize.c  13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/chdir-long.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/chdir-long.c,v
retrieving revision 1.8
diff -p -u -r1.8 chdir-long.c
--- lib/chdir-long.c    31 Aug 2006 21:54:54 -0000      1.8
+++ lib/chdir-long.c    13 Sep 2006 22:29:17 -0000
@@ -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:
 */
Index: lib/chdir-safer.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/chdir-safer.c,v
retrieving revision 1.3
diff -p -u -r1.3 chdir-safer.c
--- lib/chdir-safer.c   28 Aug 2006 22:59:17 -0000      1.3
+++ lib/chdir-safer.c   13 Sep 2006 22:29:17 -0000
@@ -18,9 +18,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "chdir-safer.h"
 
Index: lib/chown.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/chown.c,v
retrieving revision 1.17
diff -p -u -r1.17 chown.c
--- lib/chown.c 9 Jan 2006 23:13:56 -0000       1.17
+++ lib/chown.c 13 Sep 2006 22:29:17 -0000
@@ -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
Index: lib/cloexec.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/cloexec.c,v
retrieving revision 1.6
diff -p -u -r1.6 cloexec.c
--- lib/cloexec.c       23 Sep 2005 04:15:13 -0000      1.6
+++ lib/cloexec.c       13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/close-stream.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/close-stream.c,v
retrieving revision 1.1
diff -p -u -r1.1 close-stream.c
--- lib/close-stream.c  22 Jul 2006 22:25:09 -0000      1.1
+++ lib/close-stream.c  13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/closeout.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/closeout.c,v
retrieving revision 1.20
diff -p -u -r1.20 closeout.c
--- lib/closeout.c      22 Jul 2006 22:13:57 -0000      1.20
+++ lib/closeout.c      13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/creat-safer.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/creat-safer.c,v
retrieving revision 1.2
diff -p -u -r1.2 creat-safer.c
--- lib/creat-safer.c   19 Sep 2005 17:28:14 -0000      1.2
+++ lib/creat-safer.c   13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/cycle-check.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/cycle-check.c,v
retrieving revision 1.5
diff -p -u -r1.5 cycle-check.c
--- lib/cycle-check.c   3 Jul 2006 08:32:46 -0000       1.5
+++ lib/cycle-check.c   13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/diacrit.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/diacrit.c,v
retrieving revision 1.7
diff -p -u -r1.7 diacrit.c
--- lib/diacrit.c       14 May 2005 06:03:58 -0000      1.7
+++ lib/diacrit.c       13 Sep 2006 22:29:17 -0000
@@ -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 <address@hidden>, 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"
 
Index: lib/dirchownmod.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/dirchownmod.c,v
retrieving revision 1.3
diff -p -u -r1.3 dirchownmod.c
--- lib/dirchownmod.c   28 Aug 2006 22:59:17 -0000      1.3
+++ lib/dirchownmod.c   13 Sep 2006 22:29:17 -0000
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "dirchownmod.h"
 
Index: lib/dirfd.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/dirfd.c,v
retrieving revision 1.7
diff -p -u -r1.7 dirfd.c
--- lib/dirfd.c 19 Sep 2005 17:28:14 -0000      1.7
+++ lib/dirfd.c 13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/dirname.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/dirname.c,v
retrieving revision 1.36
diff -p -u -r1.36 dirname.c
--- lib/dirname.c       3 Jul 2006 08:32:46 -0000       1.36
+++ lib/dirname.c       13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/dup-safer.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/dup-safer.c,v
retrieving revision 1.7
diff -p -u -r1.7 dup-safer.c
--- lib/dup-safer.c     19 Sep 2005 17:28:14 -0000      1.7
+++ lib/dup-safer.c     13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/dup2.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/dup2.c,v
retrieving revision 1.8
diff -p -u -r1.8 dup2.c
--- lib/dup2.c  23 Sep 2005 04:15:13 -0000      1.8
+++ lib/dup2.c  13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/error.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/error.c,v
retrieving revision 1.46
diff -p -u -r1.46 error.c
--- lib/error.c 29 Aug 2006 16:58:34 -0000      1.46
+++ lib/error.c 13 Sep 2006 22:29:17 -0000
@@ -18,7 +18,7 @@
 
 /* Written by David MacKenzie <address@hidden>.  */
 
-#ifdef HAVE_CONFIG_H
+#if !_LIBC
 # include <config.h>
 #endif
 
Index: lib/euidaccess.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/euidaccess.c,v
retrieving revision 1.21
diff -p -u -r1.21 euidaccess.c
--- lib/euidaccess.c    23 Sep 2005 04:15:13 -0000      1.21
+++ lib/euidaccess.c    13 Sep 2006 22:29:17 -0000
@@ -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
 
Index: lib/exclude.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/exclude.c,v
retrieving revision 1.29
diff -p -u -r1.29 exclude.c
--- lib/exclude.c       5 Jul 2006 23:35:19 -0000       1.29
+++ lib/exclude.c       13 Sep 2006 22:29:17 -0000
@@ -20,9 +20,7 @@
 
 /* Written by Paul Eggert <address@hidden>  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdbool.h>
 
Index: lib/exitfail.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/exitfail.c,v
retrieving revision 1.6
diff -p -u -r1.6 exitfail.c
--- lib/exitfail.c      22 Jul 2006 14:37:42 -0000      1.6
+++ lib/exitfail.c      13 Sep 2006 22:29:17 -0000
@@ -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"
Index: lib/fchmodat.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/fchmodat.c,v
retrieving revision 1.1
diff -p -u -r1.1 fchmodat.c
--- lib/fchmodat.c      19 Aug 2006 22:17:01 -0000      1.1
+++ lib/fchmodat.c      13 Sep 2006 22:29:17 -0000
@@ -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 */
Index: lib/fchown-stub.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/fchown-stub.c,v
retrieving revision 1.2
diff -p -u -r1.2 fchown-stub.c
--- lib/fchown-stub.c   19 Sep 2005 17:28:14 -0000      1.2
+++ lib/fchown-stub.c   13 Sep 2006 22:29:17 -0000
@@ -1,6 +1,5 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
 #include <sys/types.h>
 #include <errno.h>
 
Index: lib/fd-safer.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/fd-safer.c,v
retrieving revision 1.4
diff -p -u -r1.4 fd-safer.c
--- lib/fd-safer.c      19 Sep 2005 17:28:14 -0000      1.4
+++ lib/fd-safer.c      13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/file-type.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/file-type.c,v
retrieving revision 1.9
diff -p -u -r1.9 file-type.c
--- lib/file-type.c     19 Sep 2005 17:28:14 -0000      1.9
+++ lib/file-type.c     13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/fileblocks.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/fileblocks.c,v
retrieving revision 1.21
diff -p -u -r1.21 fileblocks.c
--- lib/fileblocks.c    25 Jan 2006 07:34:10 -0000      1.21
+++ lib/fileblocks.c    13 Sep 2006 22:29:17 -0000
@@ -18,10 +18,8 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Brian L. Matthews, address@hidden */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+
+#include <config.h>
 
 #include <sys/types.h>
 
Index: lib/filemode.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/filemode.c,v
retrieving revision 1.17
diff -p -u -r1.17 filemode.c
--- lib/filemode.c      3 Jul 2006 08:32:46 -0000       1.17
+++ lib/filemode.c      13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/filenamecat.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/filenamecat.c,v
retrieving revision 1.3
diff -p -u -r1.3 filenamecat.c
--- lib/filenamecat.c   3 Jul 2006 08:32:46 -0000       1.3
+++ lib/filenamecat.c   13 Sep 2006 22:29:17 -0000
@@ -19,9 +19,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "filenamecat.h"
Index: lib/fnmatch.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/fnmatch.c,v
retrieving revision 1.35
diff -p -u -r1.35 fnmatch.c
--- lib/fnmatch.c       6 Jul 2006 21:51:30 -0000       1.35
+++ lib/fnmatch.c       13 Sep 2006 22:29:17 -0000
@@ -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
 
Index: lib/fopen-safer.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/fopen-safer.c,v
retrieving revision 1.5
diff -p -u -r1.5 fopen-safer.c
--- lib/fopen-safer.c   19 Sep 2005 17:28:14 -0000      1.5
+++ lib/fopen-safer.c   13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/fprintftime.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/fprintftime.c,v
retrieving revision 1.1
diff -p -u -r1.1 fprintftime.c
--- lib/fprintftime.c   16 Dec 2005 15:07:03 -0000      1.1
+++ lib/fprintftime.c   13 Sep 2006 22:29:17 -0000
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "fprintftime.h"
 #define FPRINTFTIME 1
Index: lib/free.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/free.c,v
retrieving revision 1.3
diff -p -u -r1.3 free.c
--- lib/free.c  19 Sep 2005 17:28:14 -0000      1.3
+++ lib/free.c  13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/fsusage.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/fsusage.c,v
retrieving revision 1.54
diff -p -u -r1.54 fsusage.c
--- lib/fsusage.c       3 Jul 2006 08:32:46 -0000       1.54
+++ lib/fsusage.c       13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/ftruncate.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/ftruncate.c,v
retrieving revision 1.10
diff -p -u -r1.10 ftruncate.c
--- lib/ftruncate.c     23 Sep 2005 04:15:13 -0000      1.10
+++ lib/ftruncate.c     13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/fts-cycle.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/fts-cycle.c,v
retrieving revision 1.5
diff -p -u -r1.5 fts-cycle.c
--- lib/fts-cycle.c     3 Jul 2006 08:32:46 -0000       1.5
+++ lib/fts-cycle.c     13 Sep 2006 22:29:17 -0000
@@ -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"
Index: lib/fts.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/fts.c,v
retrieving revision 1.15
diff -p -u -r1.15 fts.c
--- lib/fts.c   28 Aug 2006 22:59:17 -0000      1.15
+++ lib/fts.c   13 Sep 2006 22:29:17 -0000
@@ -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";
Index: lib/full-write.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/full-write.c,v
retrieving revision 1.22
diff -p -u -r1.22 full-write.c
--- lib/full-write.c    22 Jul 2006 14:54:26 -0000      1.22
+++ lib/full-write.c    13 Sep 2006 22:29:17 -0000
@@ -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
Index: lib/gai_strerror.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/gai_strerror.c,v
retrieving revision 1.5
diff -p -u -r1.5 gai_strerror.c
--- lib/gai_strerror.c  27 Jan 2006 12:50:41 -0000      1.5
+++ lib/gai_strerror.c  13 Sep 2006 22:29:17 -0000
@@ -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
 
Index: lib/getcwd.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getcwd.c,v
retrieving revision 1.14
diff -p -u -r1.14 getcwd.c
--- lib/getcwd.c        11 Jul 2006 06:02:51 -0000      1.14
+++ lib/getcwd.c        13 Sep 2006 22:29:17 -0000
@@ -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
 
Index: lib/getdate.y
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getdate.y,v
retrieving revision 1.105
diff -p -u -r1.105 getdate.y
--- lib/getdate.y       6 Jul 2006 21:51:30 -0000       1.105
+++ lib/getdate.y       13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/getdomainname.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getdomainname.c,v
retrieving revision 1.4
diff -p -u -r1.4 getdomainname.c
--- lib/getdomainname.c 14 May 2005 06:03:58 -0000      1.4
+++ lib/getdomainname.c 13 Sep 2006 22:29:17 -0000
@@ -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"
Index: lib/getgroups.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getgroups.c,v
retrieving revision 1.12
diff -p -u -r1.12 getgroups.c
--- lib/getgroups.c     19 Sep 2005 17:28:14 -0000      1.12
+++ lib/getgroups.c     13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/gethostname.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/gethostname.c,v
retrieving revision 1.7
diff -p -u -r1.7 gethostname.c
--- lib/gethostname.c   14 May 2005 06:03:58 -0000      1.7
+++ lib/gethostname.c   13 Sep 2006 22:29:17 -0000
@@ -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 <address@hidden> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #ifdef HAVE_UNAME
 # include <sys/utsname.h>
Index: lib/gethrxtime.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/gethrxtime.c,v
retrieving revision 1.4
diff -p -u -r1.4 gethrxtime.c
--- lib/gethrxtime.c    10 Nov 2005 20:19:38 -0000      1.4
+++ lib/gethrxtime.c    13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/getloadavg.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getloadavg.c,v
retrieving revision 1.33
diff -p -u -r1.33 getloadavg.c
--- lib/getloadavg.c    1 Sep 2006 19:54:35 -0000       1.33
+++ lib/getloadavg.c    13 Sep 2006 22:29:17 -0000
@@ -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
 
Index: lib/getlogin_r.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getlogin_r.c,v
retrieving revision 1.5
diff -p -u -r1.5 getlogin_r.c
--- lib/getlogin_r.c    8 Mar 2006 01:37:15 -0000       1.5
+++ lib/getlogin_r.c    13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/getndelim2.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getndelim2.c,v
retrieving revision 1.12
diff -p -u -r1.12 getndelim2.c
--- lib/getndelim2.c    21 Aug 2006 06:11:26 -0000      1.12
+++ lib/getndelim2.c    13 Sep 2006 22:29:17 -0000
@@ -20,9 +20,7 @@
 
 /* Originally written by Jan Brittenson, address@hidden  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "getndelim2.h"
 
Index: lib/getnline.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getnline.c,v
retrieving revision 1.5
diff -p -u -r1.5 getnline.c
--- lib/getnline.c      19 Sep 2005 17:28:14 -0000      1.5
+++ lib/getnline.c      13 Sep 2006 22:29:17 -0000
@@ -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"
Index: lib/getopt.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getopt.c,v
retrieving revision 1.49
diff -p -u -r1.49 getopt.c
--- lib/getopt.c        6 Jul 2006 23:29:27 -0000       1.49
+++ lib/getopt.c        13 Sep 2006 22:29:17 -0000
@@ -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.  */

-#ifdef HAVE_CONFIG_H
+#ifndef_LIBC
 # include <config.h>
 #endif
 
Index: lib/getopt1.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getopt1.c,v
retrieving revision 1.22
diff -p -u -r1.22 getopt1.c
--- lib/getopt1.c       19 Sep 2005 17:28:14 -0000      1.22
+++ lib/getopt1.c       13 Sep 2006 22:29:17 -0000
@@ -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.  */

-#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"
Index: lib/getpass.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getpass.c,v
retrieving revision 1.16
diff -p -u -r1.16 getpass.c
--- lib/getpass.c       26 May 2006 10:13:59 -0000      1.16
+++ lib/getpass.c       13 Sep 2006 22:29:17 -0000
@@ -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
 
Index: lib/gettime.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/gettime.c,v
retrieving revision 1.6
diff -p -u -r1.6 gettime.c
--- lib/gettime.c       9 Jan 2006 23:13:56 -0000       1.6
+++ lib/gettime.c       13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/gettimeofday.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/gettimeofday.c,v
retrieving revision 1.7
diff -p -u -r1.7 gettimeofday.c
--- lib/gettimeofday.c  19 Sep 2005 17:28:14 -0000      1.7
+++ lib/gettimeofday.c  13 Sep 2006 22:29:17 -0000
@@ -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.  */
Index: lib/getugroups.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getugroups.c,v
retrieving revision 1.16
diff -p -u -r1.16 getugroups.c
--- lib/getugroups.c    19 May 2006 13:00:12 -0000      1.16
+++ lib/getugroups.c    13 Sep 2006 22:29:17 -0000
@@ -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 *". */
Index: lib/getusershell.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getusershell.c,v
retrieving revision 1.23
diff -p -u -r1.23 getusershell.c
--- lib/getusershell.c  5 Jul 2006 23:35:19 -0000       1.23
+++ lib/getusershell.c  13 Sep 2006 22:29:17 -0000
@@ -19,9 +19,7 @@
 
 /* Written by David MacKenzie <address@hidden> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #ifndef SHELLS_FILE
 # ifndef __DJGPP__
Index: lib/glob.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/glob.c,v
retrieving revision 1.9
diff -p -u -r1.9 glob.c
--- lib/glob.c  11 Jul 2006 13:18:42 -0000      1.9
+++ lib/glob.c  13 Sep 2006 22:29:17 -0000
@@ -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
 
Index: lib/group-member.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/group-member.c,v
retrieving revision 1.17
diff -p -u -r1.17 group-member.c
--- lib/group-member.c  23 Sep 2005 04:15:13 -0000      1.17
+++ lib/group-member.c  13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/hard-locale.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/hard-locale.c,v
retrieving revision 1.12
diff -p -u -r1.12 hard-locale.c
--- lib/hard-locale.c   19 Sep 2005 17:28:14 -0000      1.12
+++ lib/hard-locale.c   13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/hash-pjw.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/hash-pjw.c,v
retrieving revision 1.5
diff -p -u -r1.5 hash-pjw.c
--- lib/hash-pjw.c      19 Sep 2005 17:28:14 -0000      1.5
+++ lib/hash-pjw.c      13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/hash.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/hash.c,v
retrieving revision 1.39
diff -p -u -r1.39 hash.c
--- lib/hash.c  19 Sep 2005 17:28:14 -0000      1.39
+++ lib/hash.c  13 Sep 2006 22:29:17 -0000
@@ -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"
Index: lib/human.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/human.c,v
retrieving revision 1.32
diff -p -u -r1.32 human.c
--- lib/human.c 19 Sep 2005 17:28:14 -0000      1.32
+++ lib/human.c 13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/idcache.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/idcache.c,v
retrieving revision 1.16
diff -p -u -r1.16 idcache.c
--- lib/idcache.c       23 Sep 2005 04:15:13 -0000      1.16
+++ lib/idcache.c       13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/inet_ntop.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/inet_ntop.c,v
retrieving revision 1.5
diff -p -u -r1.5 inet_ntop.c
--- lib/inet_ntop.c     19 Jun 2006 12:28:18 -0000      1.5
+++ lib/inet_ntop.c     13 Sep 2006 22:29:17 -0000
@@ -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"
Index: lib/inet_pton.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/inet_pton.c,v
retrieving revision 1.2
diff -p -u -r1.2 inet_pton.c
--- lib/inet_pton.c     21 Jun 2006 17:53:49 -0000      1.2
+++ lib/inet_pton.c     13 Sep 2006 22:29:17 -0000
@@ -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"
Index: lib/inttostr.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/inttostr.c,v
retrieving revision 1.3
diff -p -u -r1.3 inttostr.c
--- lib/inttostr.c      19 Sep 2005 17:28:14 -0000      1.3
+++ lib/inttostr.c      13 Sep 2006 22:29:17 -0000
@@ -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
Index: lib/isdir.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/isdir.c,v
retrieving revision 1.16
diff -p -u -r1.16 isdir.c
--- lib/isdir.c 19 Sep 2005 17:28:14 -0000      1.16
+++ lib/isdir.c 13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/lchown.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/lchown.c,v
retrieving revision 1.16
diff -p -u -r1.16 lchown.c
--- lib/lchown.c        19 Sep 2005 17:28:14 -0000      1.16
+++ lib/lchown.c        13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/linebuffer.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/linebuffer.c,v
retrieving revision 1.20
diff -p -u -r1.20 linebuffer.c
--- lib/linebuffer.c    14 May 2005 06:03:58 -0000      1.20
+++ lib/linebuffer.c    13 Sep 2006 22:29:17 -0000
@@ -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. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
Index: lib/long-options.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/long-options.c,v
retrieving revision 1.23
diff -p -u -r1.23 long-options.c
--- lib/long-options.c  19 Sep 2005 17:28:14 -0000      1.23
+++ lib/long-options.c  13 Sep 2006 22:29:17 -0000
@@ -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"
Index: lib/lstat.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/lstat.c,v
retrieving revision 1.10
diff -p -u -r1.10 lstat.c
--- lib/lstat.c 14 Feb 2006 23:00:23 -0000      1.10
+++ lib/lstat.c 13 Sep 2006 22:29:17 -0000
@@ -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
Index: lib/malloc.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/malloc.c,v
retrieving revision 1.9
diff -p -u -r1.9 malloc.c
--- lib/malloc.c        19 Sep 2005 17:28:14 -0000      1.9
+++ lib/malloc.c        13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/md5.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/md5.c,v
retrieving revision 1.23
diff -p -u -r1.23 md5.c
--- lib/md5.c   12 Jan 2006 05:40:19 -0000      1.23
+++ lib/md5.c   13 Sep 2006 22:29:17 -0000
@@ -20,9 +20,7 @@
 
 /* Written by Ulrich Drepper <address@hidden>, 1995.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "md5.h"
 
Index: lib/memcasecmp.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/memcasecmp.c,v
retrieving revision 1.13
diff -p -u -r1.13 memcasecmp.c
--- lib/memcasecmp.c    5 Jul 2006 23:35:19 -0000       1.13
+++ lib/memcasecmp.c    13 Sep 2006 22:29:17 -0000
@@ -17,9 +17,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "memcasecmp.h"
 
Index: lib/memchr.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/memchr.c,v
retrieving revision 1.19
diff -p -u -r1.19 memchr.c
--- lib/memchr.c        19 Aug 2005 12:06:57 -0000      1.19
+++ lib/memchr.c        13 Sep 2006 22:29:17 -0000
@@ -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 (address@hidden),
@@ -24,7 +24,7 @@ You should have received a copy of the G
 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
 
Index: lib/memcmp.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/memcmp.c,v
retrieving revision 1.13
diff -p -u -r1.13 memcmp.c
--- lib/memcmp.c        19 Sep 2005 17:28:14 -0000      1.13
+++ lib/memcmp.c        13 Sep 2006 22:29:17 -0000
@@ -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 (address@hidden).
@@ -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
 
Index: lib/memcoll.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/memcoll.c,v
retrieving revision 1.16
diff -p -u -r1.16 memcoll.c
--- lib/memcoll.c       16 Aug 2006 17:22:49 -0000      1.16
+++ lib/memcoll.c       13 Sep 2006 22:29:17 -0000
@@ -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 <address@hidden>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "memcoll.h"
 
Index: lib/memcpy.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/memcpy.c,v
retrieving revision 1.11
diff -p -u -r1.11 memcpy.c
--- lib/memcpy.c        19 Sep 2005 17:28:14 -0000      1.11
+++ lib/memcpy.c        13 Sep 2006 22:29:17 -0000
@@ -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 <address@hidden>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stddef.h>
 
Index: lib/memmove.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/memmove.c,v
retrieving revision 1.9
diff -p -u -r1.9 memmove.c
--- lib/memmove.c       19 Sep 2005 17:28:14 -0000      1.9
+++ lib/memmove.c       13 Sep 2006 22:29:17 -0000
@@ -3,9 +3,7 @@
    In the public domain.
    By David MacKenzie <address@hidden>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stddef.h>
 
Index: lib/memrchr.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/memrchr.c,v
retrieving revision 1.7
diff -p -u -r1.7 memrchr.c
--- lib/memrchr.c       14 May 2005 06:03:58 -0000      1.7
+++ lib/memrchr.c       13 Sep 2006 22:29:17 -0000
@@ -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 (address@hidden),
    with help from Dan Sahlin (address@hidden) 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
Index: lib/mkancesdirs.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/mkancesdirs.c,v
retrieving revision 1.1
diff -p -u -r1.1 mkancesdirs.c
--- lib/mkancesdirs.c   17 Jul 2006 06:06:48 -0000      1.1
+++ lib/mkancesdirs.c   13 Sep 2006 22:29:17 -0000
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "mkancesdirs.h"
 
Index: lib/mkdir-p.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/mkdir-p.c,v
retrieving revision 1.6
diff -p -u -r1.6 mkdir-p.c
--- lib/mkdir-p.c       17 Jul 2006 06:06:48 -0000      1.6
+++ lib/mkdir-p.c       13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/mkdir.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/mkdir.c,v
retrieving revision 1.19
diff -p -u -r1.19 mkdir.c
--- lib/mkdir.c 19 Sep 2005 17:28:14 -0000      1.19
+++ lib/mkdir.c 13 Sep 2006 22:29:17 -0000
@@ -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
Index: lib/mkdirat.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/mkdirat.c,v
retrieving revision 1.2
diff -p -u -r1.2 mkdirat.c
--- lib/mkdirat.c       17 Aug 2006 20:34:21 -0000      1.2
+++ lib/mkdirat.c       13 Sep 2006 22:29:17 -0000
@@ -17,9 +17,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "openat.h"
 
Index: lib/mkstemp-safer.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/mkstemp-safer.c,v
retrieving revision 1.4
diff -p -u -r1.4 mkstemp-safer.c
--- lib/mkstemp-safer.c 27 Jul 2006 12:44:38 -0000      1.4
+++ lib/mkstemp-safer.c 13 Sep 2006 22:29:17 -0000
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "stdlib-safer.h"
 
Index: lib/mkstemp.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/mkstemp.c,v
retrieving revision 1.6
diff -p -u -r1.6 mkstemp.c
--- lib/mkstemp.c       19 Sep 2005 17:28:14 -0000      1.6
+++ lib/mkstemp.c       13 Sep 2006 22:29:17 -0000
@@ -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
Index: lib/modechange.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/modechange.c,v
retrieving revision 1.34
diff -p -u -r1.34 modechange.c
--- lib/modechange.c    28 Jul 2006 07:39:27 -0000      1.34
+++ lib/modechange.c    13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/mountlist.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/mountlist.c,v
retrieving revision 1.57
diff -p -u -r1.57 mountlist.c
--- lib/mountlist.c     1 Sep 2006 19:49:22 -0000       1.57
+++ lib/mountlist.c     13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/nanosleep.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/nanosleep.c,v
retrieving revision 1.20
diff -p -u -r1.20 nanosleep.c
--- lib/nanosleep.c     12 Sep 2006 10:13:20 -0000      1.20
+++ lib/nanosleep.c     13 Sep 2006 22:29:17 -0000
@@ -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)  */
Index: lib/obstack.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/obstack.c,v
retrieving revision 1.33
diff -p -u -r1.33 obstack.c
--- lib/obstack.c       21 Aug 2006 06:11:26 -0000      1.33
+++ lib/obstack.c       13 Sep 2006 22:29:17 -0000
@@ -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
 
Index: lib/open-safer.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/open-safer.c,v
retrieving revision 1.5
diff -p -u -r1.5 open-safer.c
--- lib/open-safer.c    19 Sep 2005 17:28:14 -0000      1.5
+++ lib/open-safer.c    13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/openat-die.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/openat-die.c,v
retrieving revision 1.2
diff -p -u -r1.2 openat-die.c
--- lib/openat-die.c    2 Oct 2005 22:38:45 -0000       1.2
+++ lib/openat-die.c    13 Sep 2006 22:29:17 -0000
@@ -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>
 
Index: lib/openat.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/openat.c,v
retrieving revision 1.12
diff -p -u -r1.12 openat.c
--- lib/openat.c        17 Aug 2006 20:34:21 -0000      1.12
+++ lib/openat.c        13 Sep 2006 22:29:17 -0000
@@ -17,9 +17,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "openat.h"
 
Index: lib/pagealign_alloc.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/pagealign_alloc.c,v
retrieving revision 1.9
diff -p -u -r1.9 pagealign_alloc.c
--- lib/pagealign_alloc.c       8 Mar 2006 01:37:15 -0000       1.9
+++ lib/pagealign_alloc.c       13 Sep 2006 22:29:17 -0000
@@ -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 <address@hidden>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "pagealign_alloc.h"
 
Index: lib/physmem.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/physmem.c,v
retrieving revision 1.7
diff -p -u -r1.7 physmem.c
--- lib/physmem.c       23 Sep 2005 04:15:13 -0000      1.7
+++ lib/physmem.c       13 Sep 2006 22:29:17 -0000
@@ -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:
 */
Index: lib/pipe-safer.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/pipe-safer.c,v
retrieving revision 1.4
diff -p -u -r1.4 pipe-safer.c
--- lib/pipe-safer.c    11 Aug 2006 20:25:07 -0000      1.4
+++ lib/pipe-safer.c    13 Sep 2006 22:29:17 -0000
@@ -17,9 +17,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "unistd-safer.h"
 
Index: lib/posixtm.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/posixtm.c,v
retrieving revision 1.23
diff -p -u -r1.23 posixtm.c
--- lib/posixtm.c       6 Jul 2006 21:51:31 -0000       1.23
+++ lib/posixtm.c       13 Sep 2006 22:29:17 -0000
@@ -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)

 /*
 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:
 */
Index: lib/posixver.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/posixver.c,v
retrieving revision 1.7
diff -p -u -r1.7 posixver.c
--- lib/posixver.c      23 Sep 2005 04:15:13 -0000      1.7
+++ lib/posixver.c      13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/putenv.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/putenv.c,v
retrieving revision 1.31
diff -p -u -r1.31 putenv.c
--- lib/putenv.c        23 Sep 2005 04:15:13 -0000      1.31
+++ lib/putenv.c        13 Sep 2006 22:29:17 -0000
@@ -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 address@hidden
@@ -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>
 
Index: lib/quote.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/quote.c,v
retrieving revision 1.8
diff -p -u -r1.8 quote.c
--- lib/quote.c 22 Jul 2006 16:20:20 -0000      1.8
+++ lib/quote.c 13 Sep 2006 22:29:17 -0000
@@ -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 <address@hidden> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "quotearg.h"
 #include "quote.h"
Index: lib/quotearg.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/quotearg.c,v
retrieving revision 1.48
diff -p -u -r1.48 quotearg.c
--- lib/quotearg.c      22 Jan 2006 08:46:02 -0000      1.48
+++ lib/quotearg.c      13 Sep 2006 22:29:17 -0000
@@ -19,9 +19,7 @@
 
 /* Written by Paul Eggert <address@hidden> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "quotearg.h"
 
Index: lib/raise.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/raise.c,v
retrieving revision 1.4
diff -p -u -r1.4 raise.c
--- lib/raise.c 23 Sep 2005 04:15:13 -0000      1.4
+++ lib/raise.c 13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/readtokens.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/readtokens.c,v
retrieving revision 1.16
diff -p -u -r1.16 readtokens.c
--- lib/readtokens.c    14 May 2005 06:03:58 -0000      1.16
+++ lib/readtokens.c    13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/readtokens0.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/readtokens0.c,v
retrieving revision 1.3
diff -p -u -r1.3 readtokens0.c
--- lib/readtokens0.c   19 Sep 2005 17:28:14 -0000      1.3
+++ lib/readtokens0.c   13 Sep 2006 22:29:17 -0000
@@ -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"
Index: lib/readutmp.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/readutmp.c,v
retrieving revision 1.24
diff -p -u -r1.24 readutmp.c
--- lib/readutmp.c      19 Sep 2005 17:28:14 -0000      1.24
+++ lib/readutmp.c      13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/realloc.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/realloc.c,v
retrieving revision 1.12
diff -p -u -r1.12 realloc.c
--- lib/realloc.c       19 Sep 2005 17:28:14 -0000      1.12
+++ lib/realloc.c       13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/regex.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/regex.c,v
retrieving revision 1.94
diff -p -u -r1.94 regex.c
--- lib/regex.c 10 Apr 2006 06:43:33 -0000      1.94
+++ lib/regex.c 13 Sep 2006 22:29:17 -0000
@@ -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
Index: lib/rename.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/rename.c,v
retrieving revision 1.24
diff -p -u -r1.24 rename.c
--- lib/rename.c        19 Sep 2005 17:28:15 -0000      1.24
+++ lib/rename.c        13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/rmdir.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/rmdir.c,v
retrieving revision 1.15
diff -p -u -r1.15 rmdir.c
--- lib/rmdir.c 19 Sep 2005 17:28:15 -0000      1.15
+++ lib/rmdir.c 13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/rpmatch.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/rpmatch.c,v
retrieving revision 1.19
diff -p -u -r1.19 rpmatch.c
--- lib/rpmatch.c       19 Sep 2005 17:28:15 -0000      1.19
+++ lib/rpmatch.c       13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/safe-read.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/safe-read.c,v
retrieving revision 1.27
diff -p -u -r1.27 safe-read.c
--- lib/safe-read.c     23 Sep 2005 04:15:13 -0000      1.27
+++ lib/safe-read.c     13 Sep 2006 22:29:17 -0000
@@ -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
Index: lib/same.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/same.c,v
retrieving revision 1.20
diff -p -u -r1.20 same.c
--- lib/same.c  3 Jul 2006 08:32:46 -0000       1.20
+++ lib/same.c  13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/save-cwd.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/save-cwd.c,v
retrieving revision 1.26
diff -p -u -r1.26 save-cwd.c
--- lib/save-cwd.c      9 Jan 2006 23:13:57 -0000       1.26
+++ lib/save-cwd.c      13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/savedir.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/savedir.c,v
retrieving revision 1.32
diff -p -u -r1.32 savedir.c
--- lib/savedir.c       17 Aug 2006 20:34:21 -0000      1.32
+++ lib/savedir.c       13 Sep 2006 22:29:17 -0000
@@ -19,9 +19,7 @@
 
 /* Written by David MacKenzie <address@hidden>. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "savedir.h"
 
Index: lib/setenv.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/setenv.c,v
retrieving revision 1.17
diff -p -u -r1.17 setenv.c
--- lib/setenv.c        29 Jul 2006 14:38:53 -0000      1.17
+++ lib/setenv.c        13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/settime.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/settime.c,v
retrieving revision 1.6
diff -p -u -r1.6 settime.c
--- lib/settime.c       2 Oct 2005 22:38:45 -0000       1.6
+++ lib/settime.c       13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/sha1.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/sha1.c,v
retrieving revision 1.9
diff -p -u -r1.9 sha1.c
--- lib/sha1.c  11 May 2006 19:50:07 -0000      1.9
+++ lib/sha1.c  13 Sep 2006 22:29:17 -0000
@@ -23,9 +23,7 @@
       Robert Klep <address@hidden>  -- Expansion function fix
 */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "sha1.h"
 
Index: lib/sig2str.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/sig2str.c,v
retrieving revision 1.8
diff -p -u -r1.8 sig2str.c
--- lib/sig2str.c       6 Jul 2006 21:51:31 -0000       1.8
+++ lib/sig2str.c       13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/snprintf.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/snprintf.c,v
retrieving revision 1.10
diff -p -u -r1.10 snprintf.c
--- lib/snprintf.c      11 Aug 2006 17:47:58 -0000      1.10
+++ lib/snprintf.c      13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/strdup.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strdup.c,v
retrieving revision 1.17
diff -p -u -r1.17 strdup.c
--- lib/strdup.c        14 May 2005 06:03:58 -0000      1.17
+++ lib/strdup.c        13 Sep 2006 22:29:17 -0000
@@ -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
Index: lib/strerror.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strerror.c,v
retrieving revision 1.4
diff -p -u -r1.4 strerror.c
--- lib/strerror.c      19 Sep 2005 17:28:15 -0000      1.4
+++ lib/strerror.c      13 Sep 2006 22:29:17 -0000
@@ -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>
 
Index: lib/strftime.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strftime.c,v
retrieving revision 1.89
diff -p -u -r1.89 strftime.c
--- lib/strftime.c      6 Jul 2006 21:51:31 -0000       1.89
+++ lib/strftime.c      13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/stripslash.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/stripslash.c,v
retrieving revision 1.16
diff -p -u -r1.16 stripslash.c
--- lib/stripslash.c    3 Jul 2006 08:32:46 -0000       1.16
+++ lib/stripslash.c    13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/strndup.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strndup.c,v
retrieving revision 1.15
diff -p -u -r1.15 strndup.c
--- lib/strndup.c       30 May 2006 19:14:05 -0000      1.15
+++ lib/strndup.c       13 Sep 2006 22:29:17 -0000
@@ -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
 
Index: lib/strnlen.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strnlen.c,v
retrieving revision 1.13
diff -p -u -r1.13 strnlen.c
--- lib/strnlen.c       24 Jan 2006 07:40:58 -0000      1.13
+++ lib/strnlen.c       13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/strpbrk.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strpbrk.c,v
retrieving revision 1.7
diff -p -u -r1.7 strpbrk.c
--- lib/strpbrk.c       14 May 2005 06:03:58 -0000      1.7
+++ lib/strpbrk.c       13 Sep 2006 22:29:17 -0000
@@ -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 address@hidden
 
@@ -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>
Index: lib/strtod.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strtod.c,v
retrieving revision 1.21
diff -p -u -r1.21 strtod.c
--- lib/strtod.c        6 Jul 2006 17:23:56 -0000       1.21
+++ lib/strtod.c        13 Sep 2006 22:29:17 -0000
@@ -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>
 
Index: lib/strtoimax.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strtoimax.c,v
retrieving revision 1.15
diff -p -u -r1.15 strtoimax.c
--- lib/strtoimax.c     21 Aug 2006 06:11:26 -0000      1.15
+++ lib/strtoimax.c     13 Sep 2006 22:29:17 -0000
@@ -19,9 +19,7 @@
 
 /* Written by Paul Eggert. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Verify interface.  */
 #include <inttypes.h>
Index: lib/strtol.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strtol.c,v
retrieving revision 1.26
diff -p -u -r1.26 strtol.c
--- lib/strtol.c        5 Jul 2006 23:35:19 -0000       1.26
+++ lib/strtol.c        13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/strverscmp.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strverscmp.c,v
retrieving revision 1.18
diff -p -u -r1.18 strverscmp.c
--- lib/strverscmp.c    6 Jul 2006 21:51:32 -0000       1.18
+++ lib/strverscmp.c    13 Sep 2006 22:29:17 -0000
@@ -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 <address@hidden>, 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
 
Index: lib/tempname.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/tempname.c,v
retrieving revision 1.19
diff -p -u -r1.19 tempname.c
--- lib/tempname.c      21 Aug 2006 06:11:26 -0000      1.19
+++ lib/tempname.c      13 Sep 2006 22:29:17 -0000
@@ -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
 
Index: lib/time_r.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/time_r.c,v
retrieving revision 1.6
diff -p -u -r1.6 time_r.c
--- lib/time_r.c        25 Mar 2006 04:36:14 -0000      1.6
+++ lib/time_r.c        13 Sep 2006 22:29:17 -0000
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "time_r.h"
 
Index: lib/timegm.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/timegm.c,v
retrieving revision 1.4
diff -p -u -r1.4 timegm.c
--- lib/timegm.c        14 May 2005 06:03:58 -0000      1.4
+++ lib/timegm.c        13 Sep 2006 22:29:17 -0000
@@ -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
Index: lib/tmpfile-safer.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/tmpfile-safer.c,v
retrieving revision 1.1
diff -p -u -r1.1 tmpfile-safer.c
--- lib/tmpfile-safer.c 23 Jul 2006 12:58:15 -0000      1.1
+++ lib/tmpfile-safer.c 13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/unlinkdir.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/unlinkdir.c,v
retrieving revision 1.3
diff -p -u -r1.3 unlinkdir.c
--- lib/unlinkdir.c     23 Sep 2005 04:15:13 -0000      1.3
+++ lib/unlinkdir.c     13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/userspec.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/userspec.c,v
retrieving revision 1.52
diff -p -u -r1.52 userspec.c
--- lib/userspec.c      17 Jul 2006 06:06:48 -0000      1.52
+++ lib/userspec.c      13 Sep 2006 22:29:17 -0000
@@ -18,9 +18,7 @@
 
 /* Written by David MacKenzie <address@hidden>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "userspec.h"
Index: lib/utime.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/utime.c,v
retrieving revision 1.13
diff -p -u -r1.13 utime.c
--- lib/utime.c 14 May 2005 06:03:58 -0000      1.13
+++ lib/utime.c 13 Sep 2006 22:29:17 -0000
@@ -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>
Index: lib/utimecmp.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/utimecmp.c,v
retrieving revision 1.7
diff -p -u -r1.7 utimecmp.c
--- lib/utimecmp.c      21 Aug 2006 06:11:26 -0000      1.7
+++ lib/utimecmp.c      13 Sep 2006 22:29:17 -0000
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "utimecmp.h"
 
Index: lib/utimens.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/utimens.c,v
retrieving revision 1.10
diff -p -u -r1.10 utimens.c
--- lib/utimens.c       11 Jun 2006 07:12:27 -0000      1.10
+++ lib/utimens.c       13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/version-etc-fsf.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/version-etc-fsf.c,v
retrieving revision 1.4
diff -p -u -r1.4 version-etc-fsf.c
--- lib/version-etc-fsf.c       19 Sep 2005 17:28:15 -0000      1.4
+++ lib/version-etc-fsf.c       13 Sep 2006 22:29:17 -0000
@@ -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"
Index: lib/version-etc.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/version-etc.c,v
retrieving revision 1.23
diff -p -u -r1.23 version-etc.c
--- lib/version-etc.c   25 Jul 2006 11:32:36 -0000      1.23
+++ lib/version-etc.c   13 Sep 2006 22:29:17 -0000
@@ -17,9 +17,7 @@
 
 /* Written by Jim Meyering. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "version-etc.h"
Index: lib/xalloc-die.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xalloc-die.c,v
retrieving revision 1.4
diff -p -u -r1.4 xalloc-die.c
--- lib/xalloc-die.c    14 Feb 2006 23:00:23 -0000      1.4
+++ lib/xalloc-die.c    13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/xgetcwd.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xgetcwd.c,v
retrieving revision 1.20
diff -p -u -r1.20 xgetcwd.c
--- lib/xgetcwd.c       19 Sep 2005 17:28:15 -0000      1.20
+++ lib/xgetcwd.c       13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/xgethostname.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xgethostname.c,v
retrieving revision 1.22
diff -p -u -r1.22 xgethostname.c
--- lib/xgethostname.c  23 Sep 2005 04:15:13 -0000      1.22
+++ lib/xgethostname.c  13 Sep 2006 22:29:17 -0000
@@ -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"
Index: lib/xmalloc.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xmalloc.c,v
retrieving revision 1.38
diff -p -u -r1.38 xmalloc.c
--- lib/xmalloc.c       19 Sep 2005 17:28:15 -0000      1.38
+++ lib/xmalloc.c       13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/xmemcoll.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xmemcoll.c,v
retrieving revision 1.6
diff -p -u -r1.6 xmemcoll.c
--- lib/xmemcoll.c      19 Sep 2005 17:28:15 -0000      1.6
+++ lib/xmemcoll.c      13 Sep 2006 22:29:17 -0000
@@ -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 <address@hidden>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <errno.h>
 #include <stdlib.h>
Index: lib/xnanosleep.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xnanosleep.c,v
retrieving revision 1.7
diff -p -u -r1.7 xnanosleep.c
--- lib/xnanosleep.c    19 Sep 2005 17:28:15 -0000      1.7
+++ lib/xnanosleep.c    13 Sep 2006 22:29:17 -0000
@@ -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"
 
Index: lib/xreadlink.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xreadlink.c,v
retrieving revision 1.21
diff -p -u -r1.21 xreadlink.c
--- lib/xreadlink.c     23 Sep 2005 04:15:13 -0000      1.21
+++ lib/xreadlink.c     13 Sep 2006 22:29:17 -0000
@@ -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 <address@hidden>  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xreadlink.h"
 
Index: lib/xstrtod.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xstrtod.c,v
retrieving revision 1.13
diff -p -u -r1.13 xstrtod.c
--- lib/xstrtod.c       3 Jul 2006 08:32:46 -0000       1.13
+++ lib/xstrtod.c       13 Sep 2006 22:29:18 -0000
@@ -19,9 +19,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xstrtod.h"
 
Index: lib/xstrtoimax.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xstrtoimax.c,v
retrieving revision 1.7
diff -p -u -r1.7 xstrtoimax.c
--- lib/xstrtoimax.c    19 Sep 2005 17:28:15 -0000      1.7
+++ lib/xstrtoimax.c    13 Sep 2006 22:29:18 -0000
@@ -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"
 
Index: lib/xstrtol.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xstrtol.c,v
retrieving revision 1.39
diff -p -u -r1.39 xstrtol.c
--- lib/xstrtol.c       5 Jul 2006 23:35:19 -0000       1.39
+++ lib/xstrtol.c       13 Sep 2006 22:29:18 -0000
@@ -19,9 +19,7 @@
 
 /* Written by Jim Meyering. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xstrtol.h"
 
Index: lib/xstrtoumax.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xstrtoumax.c,v
retrieving revision 1.11
diff -p -u -r1.11 xstrtoumax.c
--- lib/xstrtoumax.c    19 Sep 2005 17:28:15 -0000      1.11
+++ lib/xstrtoumax.c    13 Sep 2006 22:29:18 -0000
@@ -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"
 
Index: lib/yesno.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/yesno.c,v
retrieving revision 1.15
diff -p -u -r1.15 yesno.c
--- lib/yesno.c 19 Sep 2005 17:28:15 -0000      1.15
+++ lib/yesno.c 13 Sep 2006 22:29:18 -0000
@@ -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"
 






reply via email to

[Prev in Thread] Current Thread [Next in Thread]