Mercurial > hg > octave-lojdl > gnulib-hg
changeset 7302:8a1a9361108c
* _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.
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,43 @@ +2006-09-13 Paul Eggert <eggert@cs.ucla.edu> + + * _fpending.c: Include <config.h> unconditionally, since we no + longer worry about uses that don't define HAVE_CONFIG_H. + * acl.c, alloca.c, argmatch.c, atexit.c, backupfile.c: + * basename.c, c-stack.c, c-strtod.c, calloc.c, canon-host.c: + * canonicalize.c, chdir-long.c, chdir-safer.c, chown.c: + * cloexec.c, close-stream.c, closeout.c, creat-safer.c: + * cycle-check.c, diacrit.c, dirchownmod.c, dirfd.c, dirname.c: + * dup-safer.c, dup2.c, error.c, euidaccess.c, exclude.c: + * exitfail.c, fchmodat.c, fchown-stub.c, fd-safer.c: + * file-type.c, fileblocks.c, filemode.c, filenamecat.c: + * fnmatch.c, fopen-safer.c, fprintftime.c, free.c, fsusage.c: + * ftruncate.c, fts-cycle.c, fts.c, full-write.c, gai_strerror.c: + * getcwd.c, getdate.y, getdomainname.c, getgroups.c: + * gethostname.c, gethrxtime.c, getloadavg.c, getlogin_r.c: + * getndelim2.c, getnline.c, getopt.c, getopt1.c, getpass.c: + * gettime.c, gettimeofday.c, getugroups.c, getusershell.c: + * glob.c, group-member.c, hard-locale.c, hash-pjw.c, hash.c: + * human.c, idcache.c, inet_ntop.c, inet_pton.c, inttostr.c: + * isdir.c, lchown.c, linebuffer.c, long-options.c, lstat.c: + * malloc.c, md5.c, memcasecmp.c, memchr.c, memcmp.c, memcoll.c: + * memcpy.c, memmove.c, memrchr.c, mkancesdirs.c, mkdir-p.c: + * mkdir.c, mkdirat.c, mkstemp-safer.c, mkstemp.c, modechange.c: + * mountlist.c, nanosleep.c, obstack.c, open-safer.c: + * openat-die.c, openat.c, pagealign_alloc.c, physmem.c: + * pipe-safer.c, posixtm.c, posixver.c, putenv.c, quote.c: + * quotearg.c, raise.c, readtokens.c, readtokens0.c, readutmp.c: + * realloc.c, regex.c, rename.c, rmdir.c, rpmatch.c, safe-read.c: + * same.c, save-cwd.c, savedir.c, setenv.c, settime.c, sha1.c: + * sig2str.c, snprintf.c, strdup.c, strerror.c, strftime.c: + * stripslash.c, strndup.c, strnlen.c, strpbrk.c, strtod.c: + * strtoimax.c, strtol.c, strverscmp.c, tempname.c, time_r.c: + * timegm.c, tmpfile-safer.c, unlinkdir.c, userspec.c, utime.c: + * utimecmp.c, utimens.c, version-etc-fsf.c, version-etc.c: + * xalloc-die.c, xgetcwd.c, xgethostname.c, xmalloc.c: + * xmemcoll.c, xnanosleep.c, xreadlink.c, xstrtod.c: + * xstrtoimax.c, xstrtol.c, xstrtoumax.c, yesno.c: + Likewise. + 2006-09-12 Jim Meyering <jim@meyering.net> * nanosleep.c: Include <sys/types.h> before sys/select.h, to avoid
--- a/lib/__fpending.c +++ b/lib/__fpending.c @@ -1,5 +1,5 @@ /* __fpending.c -- return the number of pending output bytes on a stream - Copyright (C) 2000, 2004 Free Software Foundation, Inc. + Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ /* Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "__fpending.h"
--- a/lib/acl.c +++ b/lib/acl.c @@ -1,6 +1,6 @@ /* acl.c - access control lists - Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +18,7 @@ Written by Paul Eggert and Andreas Gruenbacher. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <stdbool.h> #include <stdlib.h>
--- a/lib/alloca.c +++ b/lib/alloca.c @@ -21,9 +21,7 @@ allocating any. It is a good idea to use alloca(0) in your main control loop, etc. to force garbage collection. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <alloca.h>
--- a/lib/argmatch.c +++ b/lib/argmatch.c @@ -1,7 +1,7 @@ /* argmatch.c -- find a match for a string in an array - Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003, 2004, 2005 Free - Software Foundation, Inc. + Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,9 +20,7 @@ /* Written by David MacKenzie <djm@ai.mit.edu> Modified by Akim Demaille <demaille@inf.enst.fr> */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #include "argmatch.h"
--- a/lib/atexit.c +++ b/lib/atexit.c @@ -1,9 +1,7 @@ /* Wrapper to implement ANSI C's atexit using SunOS's on_exit. */ /* This function is in the public domain. --Mike Stump. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> int atexit (void (*f) (void))
--- a/lib/backupfile.c +++ b/lib/backupfile.c @@ -22,9 +22,7 @@ /* Written by Paul Eggert and David MacKenzie. Some algorithms adapted from GNU Emacs. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "backupfile.h"
--- a/lib/basename.c +++ b/lib/basename.c @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "dirname.h"
--- a/lib/c-stack.c +++ b/lib/c-stack.c @@ -34,9 +34,7 @@ No attempt has been made to deal with multithreaded applications. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #ifndef __attribute__ # if __GNUC__ < 3 || __STRICT_ANSI__ @@ -304,6 +302,6 @@ /* 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: */
--- a/lib/c-strtod.c +++ b/lib/c-strtod.c @@ -1,6 +1,6 @@ /* Convert string to double, using the C locale. - Copyright (C) 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "c-strtod.h"
--- a/lib/calloc.c +++ b/lib/calloc.c @@ -1,6 +1,6 @@ /* calloc() function that is glibc compatible. This wrapper function is required at least on Tru64 UNIX 5.1. - Copyright (C) 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +18,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #undef calloc #include <stdlib.h>
--- a/lib/canon-host.c +++ b/lib/canon-host.c @@ -1,6 +1,6 @@ /* Host name canonicalization - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. Written by Derek Price <derek@ximbiot.com>. @@ -18,9 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "canon-host.h"
--- a/lib/canonicalize.c +++ b/lib/canonicalize.c @@ -1,5 +1,5 @@ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2005 Free Software Foundation, Inc. + Copyright (C) 1996-2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,9 +16,7 @@ If not, write to the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "canonicalize.h"
--- a/lib/chdir-long.c +++ b/lib/chdir-long.c @@ -17,9 +17,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "chdir-long.h" @@ -263,6 +261,6 @@ /* 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: */
--- a/lib/chdir-safer.c +++ b/lib/chdir-safer.c @@ -18,9 +18,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "chdir-safer.h"
--- a/lib/chown.c +++ b/lib/chown.c @@ -1,6 +1,7 @@ /* provide consistent interface to chown for systems that don't interpret an ID of -1 as meaning `don't change the corresponding ID'. - Copyright (C) 1997, 2004, 2005 Free Software Foundation, Inc. + + Copyright (C) 1997, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +19,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Disable the definition of chown to rpl_chown (from config.h) in this file. Otherwise, we'd get conflicting prototypes for rpl_chown on
--- a/lib/cloexec.c +++ b/lib/cloexec.c @@ -1,5 +1,6 @@ /* closexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 1991, 2004, 2005 Free Software Foundation, Inc. + + Copyright (C) 1991, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ The code is taken from glibc/manual/llio.texi */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "cloexec.h"
--- a/lib/close-stream.c +++ b/lib/close-stream.c @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "close-stream.h"
--- a/lib/closeout.c +++ b/lib/closeout.c @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "closeout.h"
--- a/lib/creat-safer.c +++ b/lib/creat-safer.c @@ -1,5 +1,6 @@ /* Invoke creat, but avoid some glitches. - Copyright (C) 2005 Free Software Foundation, Inc. + + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "fcntl-safer.h"
--- a/lib/cycle-check.c +++ b/lib/cycle-check.c @@ -19,9 +19,7 @@ /* Written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <sys/types.h> #include <sys/stat.h>
--- a/lib/diacrit.c +++ b/lib/diacrit.c @@ -1,5 +1,8 @@ /* Diacritics processing for a few character codes. - Copyright (C) 1990, 1991, 1992, 1993, 2000 Free Software Foundation, Inc. + + Copyright (C) 1990, 1991, 1992, 1993, 2000, 2006 Free Software + Foundation, Inc. + François Pinard <pinard@iro.umontreal.ca>, 1988. All this file is a temporary hack, waiting for locales in GNU. @@ -19,9 +22,7 @@ If not, write to the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "diacrit.h"
--- a/lib/dirchownmod.c +++ b/lib/dirchownmod.c @@ -18,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "dirchownmod.h"
--- a/lib/dirfd.c +++ b/lib/dirfd.c @@ -1,5 +1,6 @@ /* dirfd.c -- return the file descriptor associated with an open DIR* - Copyright (C) 2001 Free Software Foundation, Inc. + + Copyright (C) 2001, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "dirfd.h"
--- a/lib/dirname.c +++ b/lib/dirname.c @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "dirname.h"
--- a/lib/dup-safer.c +++ b/lib/dup-safer.c @@ -1,5 +1,6 @@ /* Invoke dup, but avoid some glitches. - Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. + + Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "unistd-safer.h"
--- a/lib/dup2.c +++ b/lib/dup2.c @@ -1,5 +1,6 @@ /* Duplicate an open file descriptor to a specified file descriptor. - Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc. + + Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* written by Paul Eggert */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <errno.h> #include <fcntl.h>
--- a/lib/error.c +++ b/lib/error.c @@ -18,7 +18,7 @@ /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */ -#ifdef HAVE_CONFIG_H +#if !_LIBC # include <config.h> #endif
--- a/lib/euidaccess.c +++ b/lib/euidaccess.c @@ -1,7 +1,7 @@ /* euidaccess -- check if effective user id can access file - Copyright (C) 1990, 1991, 1995, 1998, 2000, 2003, 2004, 2005 Free - Software Foundation, Inc. + Copyright (C) 1990, 1991, 1995, 1998, 2000, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -22,11 +22,8 @@ /* Written by David MacKenzie and Torbjorn Granlund. Adapted for GNU C library by Roland McGrath. */ -#ifdef HAVE_CONFIG_H +#ifndef _LIBC # include <config.h> -#endif - -#ifndef _LIBC # include "euidaccess.h" #endif
--- a/lib/exclude.c +++ b/lib/exclude.c @@ -20,9 +20,7 @@ /* Written by Paul Eggert <eggert@twinsun.com> */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <stdbool.h>
--- a/lib/exitfail.c +++ b/lib/exitfail.c @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ If not, write to the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "exitfail.h" #include "exit.h"
--- a/lib/fchmodat.c +++ b/lib/fchmodat.c @@ -17,9 +17,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "openat.h" #include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */
--- a/lib/fchown-stub.c +++ b/lib/fchown-stub.c @@ -1,6 +1,5 @@ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> + #include <sys/types.h> #include <errno.h>
--- a/lib/fd-safer.c +++ b/lib/fd-safer.c @@ -1,6 +1,6 @@ /* Return a safer copy of a file descriptor. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "unistd-safer.h"
--- a/lib/file-type.c +++ b/lib/file-type.c @@ -1,7 +1,7 @@ /* Return a string describing the type of a file. - Copyright (C) 1993, 1994, 2001, 2002, 2004, 2005 Free Software - Foundation, Inc. + Copyright (C) 1993, 1994, 2001, 2002, 2004, 2005, 2006 Free + Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,9 +19,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "file-type.h"
--- a/lib/fileblocks.c +++ b/lib/fileblocks.c @@ -18,10 +18,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Written by Brian L. Matthews, blm@6sceng.UUCP. */ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif + +#include <config.h> #include <sys/types.h>
--- a/lib/filemode.c +++ b/lib/filemode.c @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "filemode.h"
--- a/lib/filenamecat.c +++ b/lib/filenamecat.c @@ -19,9 +19,7 @@ /* Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #include "filenamecat.h"
--- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H +#ifndef _LIBC # include <config.h> #endif
--- a/lib/fopen-safer.c +++ b/lib/fopen-safer.c @@ -1,5 +1,6 @@ /* Invoke fopen, but avoid some glitches. - Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. + + Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "stdio-safer.h"
--- a/lib/fprintftime.c +++ b/lib/fprintftime.c @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "fprintftime.h" #define FPRINTFTIME 1
--- a/lib/free.c +++ b/lib/free.c @@ -1,6 +1,6 @@ /* Work around incompatibility on older systems where free (NULL) fails. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +18,7 @@ /* written by Paul Eggert */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #undef free #include <stdlib.h>
--- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "fsusage.h"
--- a/lib/ftruncate.c +++ b/lib/ftruncate.c @@ -1,9 +1,7 @@ /* ftruncate emulations that work on some System V's. This file is in the public domain. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <sys/types.h> #include <fcntl.h>
--- a/lib/fts-cycle.c +++ b/lib/fts-cycle.c @@ -18,9 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "cycle-check.h" #include "hash.h"
--- a/lib/fts.c +++ b/lib/fts.c @@ -45,9 +45,7 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
--- a/lib/full-write.c +++ b/lib/full-write.c @@ -1,7 +1,7 @@ /* An interface to read and write that retries (if necessary) until complete. Copyright (C) 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #ifdef FULL_READ
--- a/lib/gai_strerror.c +++ b/lib/gai_strerror.c @@ -16,11 +16,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H +#ifndef _LIBC # include <config.h> -#endif - -#ifndef _LIBC # include "getaddrinfo.h" #endif
--- a/lib/getcwd.c +++ b/lib/getcwd.c @@ -16,11 +16,8 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H +#if !_LIBC # include <config.h> -#endif - -#if !_LIBC # include "getcwd.h" #endif
--- a/lib/getdate.y +++ b/lib/getdate.y @@ -32,9 +32,7 @@ /* FIXME: Check for arithmetic overflow in all cases, not just some of them. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "getdate.h"
--- a/lib/getdomainname.c +++ b/lib/getdomainname.c @@ -1,5 +1,6 @@ /* getdomainname emulation for systems that doesn't have it. - Copyright (C) 2003 Free Software Foundation, Inc. + + Copyright (C) 2003, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* Written by Simon Josefsson. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #include "getdomainname.h"
--- a/lib/getgroups.c +++ b/lib/getgroups.c @@ -1,5 +1,6 @@ /* provide consistent interface to getgroups for systems that don't allow N==0 - Copyright (C) 1996, 1999, 2003 Free Software Foundation, Inc. + + Copyright (C) 1996, 1999, 2003, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,8 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> + #include <stdio.h> #include <sys/types.h> #include <errno.h>
--- a/lib/gethostname.c +++ b/lib/gethostname.c @@ -1,5 +1,6 @@ /* gethostname emulation for SysV and POSIX.1. - Copyright (C) 1992, 2003 Free Software Foundation, Inc. + + Copyright (C) 1992, 2003, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* David MacKenzie <djm@gnu.ai.mit.edu> */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #ifdef HAVE_UNAME # include <sys/utsname.h>
--- a/lib/gethrxtime.c +++ b/lib/gethrxtime.c @@ -1,6 +1,6 @@ /* gethrxtime -- get high resolution real time - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "gethrxtime.h"
--- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -84,13 +84,8 @@ /* "configure" defines CONFIGURING_GETLOADAVG to sidestep problems with partially-configured source directories. */ -#ifdef HAVE_CONFIG_H -# ifndef CONFIGURING_GETLOADAVG -# include <config.h> -# endif -#endif - #ifndef CONFIGURING_GETLOADAVG +# include <config.h> # include <stdbool.h> #endif
--- a/lib/getlogin_r.c +++ b/lib/getlogin_r.c @@ -1,6 +1,6 @@ /* Provide a working getlogin_r for systems which lack it. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +18,7 @@ /* written by Paul Eggert and Derek Price */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "getlogin_r.h"
--- a/lib/getndelim2.c +++ b/lib/getndelim2.c @@ -20,9 +20,7 @@ /* Originally written by Jan Brittenson, bson@gnu.ai.mit.edu. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "getndelim2.h"
--- a/lib/getnline.c +++ b/lib/getnline.c @@ -1,6 +1,6 @@ /* getnline - Read a line from a stream, with bounded memory allocation. - Copyright (C) 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #include "getnline.h"
--- a/lib/getopt.c +++ b/lib/getopt.c @@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H +#ifndef_LIBC # include <config.h> #endif
--- a/lib/getopt1.c +++ b/lib/getopt1.c @@ -1,5 +1,5 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004 + Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -17,13 +17,10 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#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"
--- a/lib/getpass.c +++ b/lib/getpass.c @@ -1,4 +1,6 @@ -/* Copyright (C) 1992-2001, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1992-2001, 2003, 2004, 2005, 2006 Free Software + Foundation, Inc. + This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -15,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H +#ifndef _LIBC # include <config.h> #endif
--- a/lib/gettime.c +++ b/lib/gettime.c @@ -1,5 +1,6 @@ /* gettime -- get the system clock - Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. + + Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "timespec.h"
--- a/lib/gettimeofday.c +++ b/lib/gettimeofday.c @@ -2,7 +2,8 @@ static buffer that localtime uses for it's return value. The gettimeofday function from Mac OS X 10.0.4, i.e. Darwin 1.3.7 has this problem. The tzset replacement is necessary for at least Solaris 2.5, 2.5.1, and 2.6. - Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + + Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,9 +21,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Disable the definitions of these functions (from config.h) so we can use the library versions here. */
--- a/lib/getugroups.c +++ b/lib/getugroups.c @@ -1,7 +1,7 @@ /* getugroups.c -- return a list of the groups a user is in - Copyright (C) 1990, 1991, 1998, 1999, 2000, 2003, 2004, 2005 Free - Software Foundation. + Copyright (C) 1990, 1991, 1998, 1999, 2000, 2003, 2004, 2005, 2006 + Free Software Foundation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,9 +19,7 @@ /* Written by David MacKenzie. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <sys/types.h> #include <stdio.h> /* grp.h on alpha OSF1 V2.0 uses "FILE *". */
--- a/lib/getusershell.c +++ b/lib/getusershell.c @@ -19,9 +19,7 @@ /* Written by David MacKenzie <djm@gnu.ai.mit.edu> */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #ifndef SHELLS_FILE # ifndef __DJGPP__
--- a/lib/glob.c +++ b/lib/glob.c @@ -16,7 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifdef HAVE_CONFIG_H +#ifndef _LIBC # include <config.h> #endif
--- a/lib/group-member.c +++ b/lib/group-member.c @@ -1,5 +1,7 @@ /* group-member.c -- determine whether group id is in calling user's group list - Copyright (C) 1994, 1997, 1998, 2003, 2005 Free Software Foundation, Inc. + + Copyright (C) 1994, 1997, 1998, 2003, 2005, 2006 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "group-member.h"
--- a/lib/hard-locale.c +++ b/lib/hard-locale.c @@ -1,7 +1,7 @@ /* hard-locale.c -- Determine whether a locale is hard. - Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004 Free Software - Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004, 2006 Free + Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "hard-locale.h"
--- a/lib/hash-pjw.c +++ b/lib/hash-pjw.c @@ -1,5 +1,6 @@ /* hash-pjw.c -- compute a hash value from a NUL-terminated string. - Copyright (C) 2001, 2003 Free Software Foundation, Inc. + + Copyright (C) 2001, 2003, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "hash-pjw.h"
--- a/lib/hash.c +++ b/lib/hash.c @@ -1,6 +1,6 @@ /* hash - hashing table processing. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. Written by Jim Meyering, 1992. @@ -24,9 +24,7 @@ /* Define USE_OBSTACK to 1 if you want the allocator to use obstacks instead of malloc. If you change USE_OBSTACK, you have to recompile! */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "hash.h" #include "xalloc.h"
--- a/lib/human.c +++ b/lib/human.c @@ -1,7 +1,7 @@ /* human.c -- print human readable file size - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,9 +19,7 @@ /* Written by Paul Eggert and Larry McVoy. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "human.h"
--- a/lib/idcache.c +++ b/lib/idcache.c @@ -1,7 +1,7 @@ /* idcache.c -- map user and group IDs, cached for speed - Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998, 2003, 2005 Free - Software Foundation, Inc. + Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998, 2003, 2005, 2006 + Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <stdio.h> #include <string.h>
--- a/lib/inet_ntop.c +++ b/lib/inet_ntop.c @@ -1,5 +1,6 @@ /* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form - Copyright (c) 2005, 2006 Free Software Foundation, Inc. + + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,9 +33,7 @@ * SOFTWARE. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #include "inet_ntop.h"
--- a/lib/inet_pton.c +++ b/lib/inet_pton.c @@ -1,5 +1,6 @@ /* inet_pton.c -- convert IPv4 and IPv6 addresses from text to binary form - Copyright (c) 2006 Free Software Foundation, Inc. + + Copyright (C) 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,9 +33,7 @@ * SOFTWARE. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #include "inet_pton.h"
--- a/lib/inttostr.c +++ b/lib/inttostr.c @@ -1,6 +1,6 @@ /* inttostr.c -- convert integers to printable strings - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +18,8 @@ /* Written by Paul Eggert */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> + #include "inttostr.h" /* Convert I to a printable string in BUF, which must be at least
--- a/lib/isdir.c +++ b/lib/isdir.c @@ -1,5 +1,6 @@ /* isdir.c -- determine whether a directory exists - Copyright (C) 1990, 1998 Free Software Foundation, Inc. + + Copyright (C) 1990, 1998, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <sys/types.h> #include <sys/stat.h>
--- a/lib/lchown.c +++ b/lib/lchown.c @@ -1,5 +1,7 @@ /* Provide a stub lchown function for systems that lack it. - Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation, Inc. + + Copyright (C) 1998, 1999, 2002, 2004, 2006 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +19,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <sys/types.h> #include <sys/stat.h>
--- a/lib/linebuffer.c +++ b/lib/linebuffer.c @@ -1,6 +1,6 @@ /* linebuffer.c -- read arbitrarily long lines - Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003, 2004 Free + Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003, 2004, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -18,10 +18,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Written by Richard Stallman. */ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif + +#include <config.h> #include <stdio.h> #include <stdlib.h>
--- a/lib/long-options.c +++ b/lib/long-options.c @@ -1,7 +1,7 @@ /* Utility to accept --help and --version options as unobtrusively as possible. - Copyright (C) 1993, 1994, 1998, 1999, 2000, 2002, 2003, 2004, 2005 Free - Software Foundation, Inc. + Copyright (C) 1993, 1994, 1998, 1999, 2000, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,9 +19,7 @@ /* Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #include "long-options.h"
--- a/lib/lstat.c +++ b/lib/lstat.c @@ -19,9 +19,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* The specification of these functions is in sys_stat.h. But we cannot include this include file here, because on some systems, a
--- a/lib/malloc.c +++ b/lib/malloc.c @@ -1,5 +1,6 @@ /* malloc() function that is glibc compatible. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + + Copyright (C) 1997, 1998, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #undef malloc #include <stdlib.h>
--- a/lib/md5.c +++ b/lib/md5.c @@ -20,9 +20,7 @@ /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "md5.h"
--- a/lib/memcasecmp.c +++ b/lib/memcasecmp.c @@ -17,9 +17,7 @@ /* Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "memcasecmp.h"
--- a/lib/memchr.c +++ b/lib/memchr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004 Free +/* Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2006 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), @@ -24,7 +24,7 @@ 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
--- a/lib/memcmp.c +++ b/lib/memcmp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1995, 1997, 1998, 2003 Free Software +/* Copyright (C) 1991, 1993, 1995, 1997, 1998, 2003, 2006 Free Software Foundation, Inc. Contributed by Torbjorn Granlund (tege@sics.se). @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H +#ifndef _LIBC # include <config.h> #endif
--- a/lib/memcoll.c +++ b/lib/memcoll.c @@ -1,5 +1,6 @@ /* Locale-specific memory comparison. - Copyright (C) 1999, 2002, 2003, 2004 Free Software Foundation, Inc. + + Copyright (C) 1999, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* Contributed by Paul Eggert <eggert@twinsun.com>. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "memcoll.h"
--- a/lib/memcpy.c +++ b/lib/memcpy.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997, 2000, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997, 2000, 2003, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,9 +16,7 @@ /* Written by Jim Meyering <meyering@na-net.ornl.gov>. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <stddef.h>
--- a/lib/memmove.c +++ b/lib/memmove.c @@ -3,9 +3,7 @@ In the public domain. By David MacKenzie <djm@gnu.ai.mit.edu>. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <stddef.h>
--- a/lib/memrchr.c +++ b/lib/memrchr.c @@ -1,7 +1,7 @@ /* memrchr -- find the last occurrence of a byte in a memory block - Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), with help from Dan Sahlin (dan@sics.se) and @@ -23,14 +23,11 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #if defined _LIBC # include <string.h> # include <memcopy.h> #else +# include <config.h> # include "memrchr.h" # define reg_char char #endif
--- a/lib/mkancesdirs.c +++ b/lib/mkancesdirs.c @@ -18,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "mkancesdirs.h"
--- a/lib/mkdir-p.c +++ b/lib/mkdir-p.c @@ -19,9 +19,7 @@ /* Written by Paul Eggert, David MacKenzie, and Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "mkdir-p.h"
--- a/lib/mkdir.c +++ b/lib/mkdir.c @@ -1,7 +1,7 @@ /* On some systems, mkdir ("foo/", 0700) fails because of the trailing slash. On those systems, this wrapper removes the trailing slash. - Copyright (C) 2001, 2003 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,9 +19,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Disable the definition of mkdir to rpl_mkdir (from config.h) in this file. Otherwise, we'd get conflicting prototypes for rpl_mkdir on
--- a/lib/mkdirat.c +++ b/lib/mkdirat.c @@ -17,9 +17,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "openat.h"
--- a/lib/mkstemp-safer.c +++ b/lib/mkstemp-safer.c @@ -18,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "stdlib-safer.h"
--- a/lib/mkstemp.c +++ b/lib/mkstemp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999, 2001, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2001, 2005, 2006 Free Software Foundation, Inc. This file is derived from the one in the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -15,9 +15,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Disable the definition of mkstemp to rpl_mkstemp (from config.h) in this file. Otherwise, we'd get conflicting prototypes for rpl_mkstemp on
--- a/lib/modechange.c +++ b/lib/modechange.c @@ -26,9 +26,7 @@ changing the mode of many files, this probably results in a performance gain. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "modechange.h" #include <sys/stat.h>
--- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "mountlist.h"
--- a/lib/nanosleep.c +++ b/lib/nanosleep.c @@ -19,9 +19,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Undefine nanosleep here so any prototype is not redefined to be a prototype for rpl_nanosleep. (they'd conflict e.g., on alpha-dec-osf3.2) */
--- a/lib/obstack.c +++ b/lib/obstack.c @@ -18,14 +18,11 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #ifdef _LIBC # include <obstack.h> # include <shlib-compat.h> #else +# include <config.h> # include "obstack.h" #endif
--- a/lib/open-safer.c +++ b/lib/open-safer.c @@ -1,5 +1,6 @@ /* Invoke open, but avoid some glitches. - Copyright (C) 2005 Free Software Foundation, Inc. + + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "fcntl-safer.h"
--- a/lib/openat-die.c +++ b/lib/openat-die.c @@ -1,6 +1,6 @@ /* Report a save- or restore-cwd failure in our openat replacement and then exit. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <stdlib.h>
--- a/lib/openat.c +++ b/lib/openat.c @@ -17,9 +17,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "openat.h"
--- a/lib/pagealign_alloc.c +++ b/lib/pagealign_alloc.c @@ -1,6 +1,6 @@ /* Memory allocation aligned to system page boundaries. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -19,9 +19,7 @@ /* Written by Derek R. Price <derek@ximbiot.com>. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "pagealign_alloc.h"
--- a/lib/physmem.c +++ b/lib/physmem.c @@ -1,5 +1,7 @@ /* Calculate the size of physical memory. - Copyright (C) 2000, 2001, 2003, 2005 Free Software Foundation, Inc. + + Copyright (C) 2000, 2001, 2003, 2005, 2006 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +19,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "physmem.h" @@ -300,6 +300,6 @@ /* 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: */
--- a/lib/pipe-safer.c +++ b/lib/pipe-safer.c @@ -17,9 +17,7 @@ /* Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "unistd-safer.h"
--- a/lib/posixtm.c +++ b/lib/posixtm.c @@ -1,7 +1,7 @@ /* Parse dates for touch and date. - Copyright (C) 1989, 1990, 1991, 1998, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation Inc. + Copyright (C) 1989, 1990, 1991, 1998, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 Free Software Foundation Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,9 +20,7 @@ /* Yacc-based version written by Jim Kingdon and David MacKenzie. Rewritten by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <stdbool.h> @@ -333,6 +331,6 @@ /* 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: */
--- a/lib/posixver.c +++ b/lib/posixver.c @@ -1,6 +1,7 @@ /* Which POSIX version to conform to, for utilities. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +19,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "posixver.h"
--- a/lib/putenv.c +++ b/lib/putenv.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991, 1994, 1997, 1998, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1994, 1997, 1998, 2000, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu. @@ -17,9 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <stddef.h>
--- a/lib/quote.c +++ b/lib/quote.c @@ -1,5 +1,7 @@ /* quote.c - quote arguments for output - Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc. + + Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2006 Free + Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +19,7 @@ /* Written by Paul Eggert <eggert@twinsun.com> */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "quotearg.h" #include "quote.h"
--- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -19,9 +19,7 @@ /* Written by Paul Eggert <eggert@twinsun.com> */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "quotearg.h"
--- a/lib/raise.c +++ b/lib/raise.c @@ -1,5 +1,6 @@ /* Provide a non-threads replacement for the POSIX raise function. - Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. + + Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <sys/types.h> #include <signal.h>
--- a/lib/readtokens.c +++ b/lib/readtokens.c @@ -1,5 +1,6 @@ /* readtokens.c -- Functions for reading tokens from an input stream. - Copyright (C) 1990-1991, 1999-2004 Free Software Foundation, Inc. + + Copyright (C) 1990-1991, 1999-2004, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,9 +22,7 @@ gives the same functionality, except that these functions would never return empty lines. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "readtokens.h"
--- a/lib/readtokens0.c +++ b/lib/readtokens0.c @@ -1,5 +1,6 @@ /* readtokens0.c -- Read NUL-separated tokens from an input stream. - Copyright (C) 2004 Free Software Foundation, Inc. + + Copyright (C) 2004, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,8 @@ Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> + #include <stdlib.h> #include "readtokens0.h"
--- a/lib/readutmp.c +++ b/lib/readutmp.c @@ -1,5 +1,7 @@ /* GNU's read utmp module. - Copyright (C) 1992-2001, 2003, 2004, 2005 Free Software Foundation, Inc. + + Copyright (C) 1992-2001, 2003, 2004, 2005, 2006 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +19,7 @@ /* Written by jla; revised by djm */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "readutmp.h"
--- a/lib/realloc.c +++ b/lib/realloc.c @@ -1,5 +1,6 @@ /* realloc() function that is glibc compatible. - Copyright (C) 1997, 2003, 2004 Free Software Foundation, Inc. + + Copyright (C) 1997, 2003, 2004, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #undef realloc #include <stdlib.h>
--- a/lib/regex.c +++ b/lib/regex.c @@ -17,9 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Make sure noone compiles this code with a C++ compiler. */ #if defined __cplusplus && defined _LIBC
--- a/lib/rename.c +++ b/lib/rename.c @@ -1,7 +1,8 @@ /* Work around the bug in some systems whereby rename fails when the source file has a trailing slash. The rename functions of SunOS 4.1.1_U1 and mips-dec-ultrix4.4 have this bug. - Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. + + Copyright (C) 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,9 +20,7 @@ /* written by Volker Borchert */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #undef rename #include <stdio.h>
--- a/lib/rmdir.c +++ b/lib/rmdir.c @@ -1,7 +1,7 @@ /* BSD compatible remove directory function for System V - Copyright (C) 1988, 1990, 1999, 2003, 2004, 2005 Free Software - Foundation, Inc. + Copyright (C) 1988, 1990, 1999, 2003, 2004, 2005, 2006 Free + Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <sys/types.h> #include <sys/stat.h>
--- a/lib/rpmatch.c +++ b/lib/rpmatch.c @@ -1,6 +1,8 @@ /* Determine whether string value is affirmation or negative response according to current locale's data. - Copyright (C) 1996, 1998, 2000, 2002, 2003 Free Software Foundation, Inc. + + Copyright (C) 1996, 1998, 2000, 2002, 2003, 2006 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,9 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <stddef.h> #include <stdlib.h>
--- a/lib/safe-read.c +++ b/lib/safe-read.c @@ -1,7 +1,7 @@ /* An interface to read and write that retries after interrupts. - Copyright (C) 1993, 1994, 1998, 2002, 2003, 2004, 2005 Free Software - Foundation, Inc. + Copyright (C) 1993, 1994, 1998, 2002, 2003, 2004, 2005, 2006 Free + Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #ifdef SAFE_WRITE
--- a/lib/same.c +++ b/lib/same.c @@ -19,9 +19,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <stdbool.h> #include <stdio.h>
--- a/lib/save-cwd.c +++ b/lib/save-cwd.c @@ -1,7 +1,7 @@ /* save-cwd.c -- Save and restore current working directory. - Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005 Free Software - Foundation, Inc. + Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005, 2006 Free + Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,9 +19,7 @@ /* Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "save-cwd.h"
--- a/lib/savedir.c +++ b/lib/savedir.c @@ -19,9 +19,7 @@ /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "savedir.h"
--- a/lib/setenv.c +++ b/lib/setenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992,1995-1999,2000-2003,2005 Free Software Foundation, Inc. +/* Copyright (C) 1992,1995-1999,2000-2003,2005,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H +#if !_LIBC # include <config.h> #endif #include <alloca.h>
--- a/lib/settime.c +++ b/lib/settime.c @@ -1,5 +1,6 @@ /* settime -- set the system clock - Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. + + Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "timespec.h"
--- a/lib/sha1.c +++ b/lib/sha1.c @@ -23,9 +23,7 @@ Robert Klep <robert@ilse.nl> -- Expansion function fix */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "sha1.h"
--- a/lib/sig2str.c +++ b/lib/sig2str.c @@ -1,6 +1,6 @@ /* sig2str.c -- convert between signal names and numbers - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <limits.h> #include <signal.h>
--- a/lib/snprintf.c +++ b/lib/snprintf.c @@ -16,9 +16,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "snprintf.h"
--- a/lib/strdup.c +++ b/lib/strdup.c @@ -1,5 +1,5 @@ -/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004 Free Software - Foundation, Inc. +/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004, 2006 Free + Software Foundation, Inc. This file is part of the GNU C Library. @@ -17,11 +17,8 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H +#ifndef _LIBC # include <config.h> -#endif - -#ifndef _LIBC /* Get specification. */ # include "strdup.h" #endif
--- a/lib/strerror.c +++ b/lib/strerror.c @@ -1,7 +1,7 @@ /* strerror.c --- ANSI C compatible system error routine - Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003 Free Software - Foundation, Inc. + Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003, 2006 Free + Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <limits.h>
--- a/lib/strftime.c +++ b/lib/strftime.c @@ -18,10 +18,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #ifdef _LIBC # define HAVE_MBLEN 1 # define HAVE_MBRLEN 1 @@ -32,6 +28,8 @@ # define HAVE_TZSET 1 # define MULTIBYTE_IS_FORMAT_SAFE 1 # include "../locale/localeinfo.h" +#else +# include <config.h> #endif #include <ctype.h>
--- a/lib/stripslash.c +++ b/lib/stripslash.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "dirname.h"
--- a/lib/strndup.c +++ b/lib/strndup.c @@ -18,10 +18,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H +#if !_LIBC # include <config.h> -#endif -#if !_LIBC # include "strndup.h" #endif
--- a/lib/strnlen.c +++ b/lib/strnlen.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "strnlen.h"
--- a/lib/strpbrk.c +++ b/lib/strpbrk.c @@ -1,4 +1,6 @@ -/* Copyright (C) 1991, 1994, 2000, 2002-2003 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006 Free Software + Foundation, Inc. + NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu. @@ -16,9 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <stddef.h> #include <string.h>
--- a/lib/strtod.c +++ b/lib/strtod.c @@ -14,9 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <errno.h>
--- a/lib/strtoimax.c +++ b/lib/strtoimax.c @@ -19,9 +19,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Verify interface. */ #include <inttypes.h>
--- a/lib/strtol.c +++ b/lib/strtol.c @@ -20,12 +20,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #ifdef _LIBC # define USE_NUMBER_GROUPING +#else +# include <config.h> #endif #include <ctype.h>
--- a/lib/strverscmp.c +++ b/lib/strverscmp.c @@ -1,5 +1,5 @@ /* Compare strings while treating digits characters numerically. - Copyright (C) 1997, 2000, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 1997, 2000, 2002, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997. @@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H +#if !_LIBC # include <config.h> #endif
--- a/lib/tempname.c +++ b/lib/tempname.c @@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H +#if !_LIBC # include <config.h> #endif
--- a/lib/time_r.c +++ b/lib/time_r.c @@ -18,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "time_r.h"
--- a/lib/timegm.c +++ b/lib/timegm.c @@ -1,7 +1,7 @@ /* Convert UTC calendar time to simple time. Like mktime but assumes UTC. - Copyright (C) 1994, 1997, 2003, 2004 Free Software Foundation, Inc. - This file is part of the GNU C Library. + Copyright (C) 1994, 1997, 2003, 2004, 2006 Free Software + Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,13 +17,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #ifdef _LIBC # include <time.h> #else +# include <config.h> # include "timegm.h" # include <time_r.h> # undef __gmtime_r
--- a/lib/tmpfile-safer.c +++ b/lib/tmpfile-safer.c @@ -17,9 +17,7 @@ /* Written by Eric Blake, based on ideas from Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "stdio-safer.h"
--- a/lib/unlinkdir.c +++ b/lib/unlinkdir.c @@ -1,6 +1,6 @@ /* unlinkdir.c - determine (and maybe change) whether we can unlink directories - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +18,7 @@ /* Written by Paul Eggert and Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "unlinkdir.h"
--- a/lib/userspec.c +++ b/lib/userspec.c @@ -18,9 +18,7 @@ /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #include "userspec.h"
--- a/lib/utime.c +++ b/lib/utime.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2001, 2002, 2003, 2004, 2006 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -16,9 +17,7 @@ /* derived from a function in touch.c */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #undef utime #include <sys/types.h>
--- a/lib/utimecmp.c +++ b/lib/utimecmp.c @@ -18,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "utimecmp.h"
--- a/lib/utimens.c +++ b/lib/utimens.c @@ -20,9 +20,7 @@ /* derived from a function in touch.c */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "utimens.h"
--- a/lib/version-etc-fsf.c +++ b/lib/version-etc-fsf.c @@ -1,5 +1,5 @@ /* Variable with FSF copyright information, for version-etc. - Copyright (C) 1999-2005 Free Software Foundation, Inc. + Copyright (C) 1999-2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ /* Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #include "version-etc.h"
--- a/lib/version-etc.c +++ b/lib/version-etc.c @@ -17,9 +17,7 @@ /* Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #include "version-etc.h"
--- a/lib/xalloc-die.c +++ b/lib/xalloc-die.c @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "xalloc.h"
--- a/lib/xgetcwd.c +++ b/lib/xgetcwd.c @@ -1,6 +1,6 @@ /* xgetcwd.c -- return current directory with unlimited length - Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2004, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +18,7 @@ /* Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "xgetcwd.h"
--- a/lib/xgethostname.c +++ b/lib/xgethostname.c @@ -1,7 +1,7 @@ /* xgethostname.c -- return current hostname with unlimited length - Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004, 2005 Free Software - Foundation, Inc. + Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004, 2005, 2006 Free + Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,9 +19,7 @@ /* written by Jim Meyering */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #include "xgethostname.h"
--- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -1,7 +1,8 @@ /* xmalloc.c -- malloc with out of memory checking Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "xalloc.h"
--- a/lib/xmemcoll.c +++ b/lib/xmemcoll.c @@ -1,5 +1,6 @@ /* Locale-specific memory comparison. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + + Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* Contributed by Paul Eggert <eggert@twinsun.com>. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <errno.h> #include <stdlib.h>
--- a/lib/xnanosleep.c +++ b/lib/xnanosleep.c @@ -1,5 +1,6 @@ /* xnanosleep.c -- a more convenient interface to nanosleep - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + + Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +19,7 @@ /* Mostly written (for sleep.c) by Paul Eggert. Factored out (creating this file) by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "xnanosleep.h"
--- a/lib/xreadlink.c +++ b/lib/xreadlink.c @@ -1,6 +1,7 @@ /* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage - Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,9 +20,7 @@ /* Written by Jim Meyering <jim@meyering.net> */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "xreadlink.h"
--- a/lib/xstrtod.c +++ b/lib/xstrtod.c @@ -19,9 +19,7 @@ /* Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "xstrtod.h"
--- a/lib/xstrtoimax.c +++ b/lib/xstrtoimax.c @@ -1,5 +1,6 @@ /* xstrtoimax.c -- A more useful interface to strtoimax. - Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc. + + Copyright (C) 2001, 2003, 2004, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* Cloned by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "xstrtol.h"
--- a/lib/xstrtol.c +++ b/lib/xstrtol.c @@ -19,9 +19,7 @@ /* Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "xstrtol.h"
--- a/lib/xstrtoumax.c +++ b/lib/xstrtoumax.c @@ -1,5 +1,6 @@ /* xstrtoumax.c -- A more useful interface to strtoumax. - Copyright (C) 1999, 2003, 2004 Free Software Foundation, Inc. + + Copyright (C) 1999, 2003, 2004, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +18,7 @@ /* Written by Paul Eggert. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "xstrtol.h"
--- a/lib/yesno.c +++ b/lib/yesno.c @@ -1,7 +1,7 @@ /* yesno.c -- read a yes/no response from stdin - Copyright (C) 1990, 1998, 2001, 2003, 2004, 2005 Free Software - Foundation, Inc. + Copyright (C) 1990, 1998, 2001, 2003, 2004, 2005, 2006 Free + Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "yesno.h"