Include <config.h> unconditionally, since we now assume config.h exists.

23 files changed, 60 insertions, 74 deletions

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 9247c4c5b..0949be269 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,29 @@
 2006-08-25  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* euidaccess-stat.c: Include <config.h> unconditionally, since
+	we now assume config.h exists.
+	* fchmodat.c: Likewise.
+	* fd-reopen.c: Likewise.
+	* fdopendir-glibc.c: Likewise.
+	* memxfrm.c: Likewise.
+	* printf-parse.c: Likewise.
+	* rand-isaac.c: Likewise.
+	* randint.c: Likewise.
+	* randperm.c: Likewise.
+	* randread.c: Likewise.
+	* root-dev-ino.c: Likewise.
+	* sha256.c: Likewise.
+	* sha512.c: Likewise.
+	* stdopen.c: Likewise.
+	* strintcmp.c: Likewise.
+	* strnumcmp.c: Likewise.
+	* t-chdir-long: Likewise.
+	* tsearch.c: Likewise.
+	* unicodeio.c: Likewise.
+	* vasnprintf.c: Likewise.
+	* xfts.c: Likewise.
+	* xmemxfrm.c: Likewise.
+
 	* .cvsignore: Add configmake.h, stamp-h1.
 
 2006-08-23  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/lib/euidaccess-stat.c b/lib/euidaccess-stat.c
index 8d39fa1c3..7663c463e 100644
--- a/lib/euidaccess-stat.c
+++ b/lib/euidaccess-stat.c
@@ -2,7 +2,7 @@
    This function is probably useful only for choosing whether to issue
    a prompt in an implementation of POSIX-specified rm.
 
-   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
@@ -20,9 +20,7 @@
 
 /* Adapted for use in GNU remove.c by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "euidaccess-stat.h"
 
diff --git a/lib/fchmodat.c b/lib/fchmodat.c
index 62327f83e..2598b7015 100644
--- a/lib/fchmodat.c
+++ b/lib/fchmodat.c
@@ -17,9 +17,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "openat.h"
 #include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */
diff --git a/lib/fd-reopen.c b/lib/fd-reopen.c
index 12c55f082..99376e380 100644
--- a/lib/fd-reopen.c
+++ b/lib/fd-reopen.c
@@ -1,6 +1,6 @@
 /* Invoke open, but return either a desired file descriptor or -1.
 
-   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 "fd-reopen.h"
 
diff --git a/lib/fdopendir-glibc.c b/lib/fdopendir-glibc.c
index 6598dc227..2bafac94e 100644
--- a/lib/fdopendir-glibc.c
+++ b/lib/fdopendir-glibc.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 <stdio.h>
 #include <stdlib.h>
diff --git a/lib/memxfrm.c b/lib/memxfrm.c
index 79db94b8f..09bb5f4ad 100644
--- a/lib/memxfrm.c
+++ b/lib/memxfrm.c
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert <eggert@cs.ucla.edu>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "memxfrm.h"
 
diff --git a/lib/printf-parse.c b/lib/printf-parse.c
index 0ecb86cd8..f8e0ceda5 100644
--- a/lib/printf-parse.c
+++ b/lib/printf-parse.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2004 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 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
@@ -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>
 
 /* Specification.  */
 #if WIDE_CHAR_VERSION
diff --git a/lib/rand-isaac.c b/lib/rand-isaac.c
index 8fc48f79c..cfdc643f6 100644
--- a/lib/rand-isaac.c
+++ b/lib/rand-isaac.c
@@ -31,9 +31,7 @@
  * and fast, and because the author did good work analyzing it.
  * --------------------------------------------------------------------
  */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "rand-isaac.h"
 
diff --git a/lib/randint.c b/lib/randint.c
index e461bf716..5ee738a50 100644
--- a/lib/randint.c
+++ b/lib/randint.c
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "randint.h"
 
diff --git a/lib/randperm.c b/lib/randperm.c
index 96f049446..faf34dde1 100644
--- a/lib/randperm.c
+++ b/lib/randperm.c
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "randperm.h"
 
diff --git a/lib/randread.c b/lib/randread.c
index ff3f86900..28796fe49 100644
--- a/lib/randread.c
+++ b/lib/randread.c
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "randread.h"
 
diff --git a/lib/root-dev-ino.c b/lib/root-dev-ino.c
index 9b03a121b..a78541212 100644
--- a/lib/root-dev-ino.c
+++ b/lib/root-dev-ino.c
@@ -1,5 +1,5 @@
 /* root-dev-ino.c -- get the device and inode numbers for `/'.
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 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,13 +17,12 @@
 
 /* Written by Jim Meyering. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
-#include <stdlib.h>
 #include "root-dev-ino.h"
 
+#include <stdlib.h>
+
 /* Call lstat to get the device and inode numbers for `/'.
    Upon failure, return NULL.  Otherwise, set the members of
    *ROOT_D_I accordingly and return ROOT_D_I.  */
diff --git a/lib/sha256.c b/lib/sha256.c
index cea855f28..d23c509dc 100644
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -21,9 +21,7 @@
    Scott G. Miller's sha1.c
 */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "sha256.h"
 
diff --git a/lib/sha512.c b/lib/sha512.c
index 79c03e216..554e2dea2 100644
--- a/lib/sha512.c
+++ b/lib/sha512.c
@@ -21,9 +21,7 @@
    Scott G. Miller's sha1.c
 */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "sha512.h"
 
diff --git a/lib/stdopen.c b/lib/stdopen.c
index 3ca2b61e6..70e5d5328 100644
--- a/lib/stdopen.c
+++ b/lib/stdopen.c
@@ -1,6 +1,6 @@
 /* stdopen.c - ensure that the three standard file descriptors are in use
 
-   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 "stdopen.h"
 
diff --git a/lib/strintcmp.c b/lib/strintcmp.c
index 2052babe5..f8f18012f 100644
--- a/lib/strintcmp.c
+++ b/lib/strintcmp.c
@@ -1,6 +1,6 @@
 /* Compare integer strings.
 
-   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 "strnumcmp-in.h"
 
diff --git a/lib/strnumcmp.c b/lib/strnumcmp.c
index 45e12f551..3afbfb1d9 100644
--- a/lib/strnumcmp.c
+++ b/lib/strnumcmp.c
@@ -1,6 +1,6 @@
 /* Compare numeric strings.
 
-   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 "strnumcmp-in.h"
 
diff --git a/lib/t-chdir-long b/lib/t-chdir-long
index 37dd7181a..2da09b31e 100755
--- a/lib/t-chdir-long
+++ b/lib/t-chdir-long
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise chdir-long's sample main program.
 
-# 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
@@ -23,7 +23,7 @@
 # temporary directories are easier to remove.
 # FIXME: don't clobber a.out
 
-gcc -DTEST_CHDIR=1 -DHAVE_CONFIG_H -I.. -g -O -W -Wall \
+gcc -DTEST_CHDIR -g -O -W -Wall \
   chdir-long.c libcoreutils.a
 
 vg='valgrind --track-fds=yes --leak-check=yes --quiet --num-callers=9'
diff --git a/lib/tsearch.c b/lib/tsearch.c
index 90de6edbb..379f0db96 100644
--- a/lib/tsearch.c
+++ b/lib/tsearch.c
@@ -1,4 +1,6 @@
-/* Copyright (C) 1995, 1996, 1997, 2000, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 2000, 2005, 2006 Free Software
+   Foundation, Inc.
+
    This file is part of the GNU C Library.
    Contributed by Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>, 1997.
 
@@ -84,9 +86,7 @@
    In this case, A has been rotated left.  This preserves the ordering of the
    binary tree.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #if __GNUC__
 # define alloca __builtin_alloca
diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index f8fedb66c..ceeff8988 100644
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -21,9 +21,7 @@
 /* Note: This file requires the locale_charset() function.  See in
    libiconv-1.8/libcharset/INTEGRATE for how to obtain it.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "unicodeio.h"
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 6a6354370..78ead8e3c 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -22,9 +22,8 @@
 # define _GNU_SOURCE    1
 #endif
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
 #ifndef IN_LIBINTL
 # include <alloca.h>
 #endif
diff --git a/lib/xfts.c b/lib/xfts.c
index c115b3752..f06fa7b1b 100644
--- a/lib/xfts.c
+++ b/lib/xfts.c
@@ -18,9 +18,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdbool.h>
 
diff --git a/lib/xmemxfrm.c b/lib/xmemxfrm.c
index 6cc726a73..8150334cd 100644
--- a/lib/xmemxfrm.c
+++ b/lib/xmemxfrm.c
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert <eggert@cs.ucla.edu>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xmemxfrm.h"