Include <config.h> unconditionally.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 7b53e0d..cb37d4a 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,74 @@
+2006-09-14  Bruno Haible  <bruno@clisp.org>
+
+       * allocsa.c: Include <config.h> unconditionally.
+       * asnprintf.c: Likewise.
+       * asprintf.c: Likewise.
+       * c-strcasecmp.c: Likewise.
+       * c-strcasestr.c: Likewise.
+       * c-strncasecmp.c: Likewise.
+       * c-strstr.c: Likewise.
+       * classpath.c: Likewise.
+       * clean-temp.c: Likewise.
+       * concatpath.c: Likewise.
+       * copy-file.c: Likewise.
+       * csharpcomp.c: Likewise.
+       * csharpexec.c: Likewise.
+       * execute.c: Likewise.
+       * fatal-signal.c: Likewise.
+       * findprog.c: Likewise.
+       * fwriteerror.c: Likewise.
+       * gl_array_list.c: Likewise.
+       * gl_array_oset.c: Likewise.
+       * gl_avltree_list.c: Likewise.
+       * gl_avltree_oset.c: Likewise.
+       * gl_avltreehash_list.c: Likewise.
+       * gl_carray_list.c: Likewise.
+       * gl_linked_list.c: Likewise.
+       * gl_linkedhash_list.c: Likewise.
+       * gl_list.c: Likewise.
+       * gl_oset.c: Likewise.
+       * gl_rbtree_list.c: Likewise.
+       * gl_rbtree_oset.c: Likewise.
+       * gl_rbtreehash_list.c: Likewise.
+       * imaxabs.c: Likewise.
+       * imaxdiv.c: Likewise.
+       * javacomp.c: Likewise.
+       * javaexec.c: Likewise.
+       * javaversion.c: Likewise.
+       * linebreak.c: Likewise.
+       * localcharset.c: Likewise.
+       * lock.c: Likewise.
+       * mbchar.c: Likewise.
+       * mbswidth.c: Likewise.
+       * mkdtemp.c: Likewise.
+       * pipe.c: Likewise.
+       * printf-args.c: Likewise.
+       * printf-parse.c: Likewise.
+       * progname.c: Likewise.
+       * progreloc.c: Likewise.
+       * readlink.c: Likewise.
+       * sh-quote.c: Likewise.
+       * stpcpy.c: Likewise.
+       * stpncpy.c: Likewise.
+       * strcasecmp.c: Likewise.
+       * strcasestr.c: Likewise.
+       * strcspn.c: Likewise.
+       * striconv.c: Likewise.
+       * strncasecmp.c: Likewise.
+       * strnlen1.c: Likewise.
+       * strstr.c: Likewise.
+       * strtok_r.c: Likewise.
+       * tls.c: Likewise.
+       * tmpdir.c: Likewise.
+       * unicodeio.c: Likewise.
+       * unsetenv.c: Likewise.
+       * vasnprintf.c: Likewise.
+       * vasprintf.c: Likewise.
+       * wait-process.c: Likewise.
+       * xallocsa.c: Likewise.
+       * xsetenv.c: Likewise.
+       * xstriconv.c: Likewise.
+
 2006-09-13  Eric Blake  <ebb9@byu.net>
 
        * getopt.c: Fix typo in last commit.
@@ -405,7 +476,7 @@
 
        2006-07-19  Mike Frysinger  <vapier@gentoo.org>
 
-       * lib/mountlist.c [ME_REMOTE]: Filter out cifs.
+       * mountlist.c [ME_REMOTE]: Filter out cifs.
        Reported by Toralf Förster in <http://bugs.gentoo.org/141012>.
 
 2006-08-08  Eric Blake  <ebb9@byu.net>
@@ -764,7 +835,7 @@
 
 2006-07-06  Jim Hyslop  <jhyslop@dreampossible.ca>  (tiny change)
 
-       * lib/getaddrinfo.c: Changes to compile under MSVC6: changed
+       * getaddrinfo.c: Changes to compile under MSVC6: changed
        '#if WIN32_NATIVE' to '#ifdef' & moved WSAAPI macro inside
        brackets.  Other minor changes to suppress some compiler
        warnings.
@@ -2793,7 +2864,7 @@
 
 2005-09-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>  (tiny change)
 
-       * lib/base64.c: Typo.
+       * base64.c: Typo.
        (base64_encode): Put b64str in initialized data section.
 
 2005-09-12  Derek Price  <derek@ximbiot.com>
@@ -2926,14 +2997,14 @@
        (SIZE_MAX) [!defined SIZE_MAX]: New macro.
        (re_alloc_oversized, re_x2alloc_oversized, re_xnmalloc):
        (re_xnrealloc, re_x2nrealloc): New inline functions.
-       * lib/regcomp.c (init_dfa, analyze, build_range_exp, parse_bracket_exp):
+       * regcomp.c (init_dfa, analyze, build_range_exp, parse_bracket_exp):
        (build_equiv_class, build_charclass): Check for arithmetic overflow
        in size expression calculations.
-       * lib/regex_internal.c (re_string_realloc_buffers):
+       * regex_internal.c (re_string_realloc_buffers):
        (build_wcs_upper_buffer, re_node_set_add_intersect):
        (re_node_set_init_union, re_node_set_insert, re_node_set_insert_last):
        (re_dfa_add_node, register_state): Likewise.
-       * lib/regexec.c (re_search_stub, re_copy_regs, re_search_internal):
+       * regexec.c (re_search_stub, re_copy_regs, re_search_internal):
        (prune_impossible_nodes, push_fail_stack, set_regs, check_arrival):
        (build_trtable, extend_buffers, match_ctx_init, match_ctx_add_entry):
        (match_ctx_add_subtop, match_ctx_add_sublast): Likewise.
@@ -3196,7 +3267,7 @@
        (re_string_char_size_at, re_string_wchar_at, re_string_elem_size_at):
        Put __attribute at function definition,
        now that the function decl has been removed.
-       * lib/regex_internal.c (re_string_peek_byte_case):
+       * regex_internal.c (re_string_peek_byte_case):
        (re_string_fetch_byte_case, re_node_set_compare, re_node_set_contains):
        Likewise.
 

diff --git a/lib/allocsa.c b/lib/allocsa.c
index a54e2d0..97652e6 100644 (file)
--- a/lib/allocsa.c
+++ b/lib/allocsa.c
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -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 "allocsa.h"

diff --git a/lib/asnprintf.c b/lib/asnprintf.c
index 1b7f4ba..26c3988 100644 (file)
--- a/lib/asnprintf.c
+++ b/lib/asnprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 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.  */
 #include "vasnprintf.h"

diff --git a/lib/asprintf.c b/lib/asprintf.c
index 7c4e64a..29ac6cf 100644 (file)
--- a/lib/asprintf.c
+++ b/lib/asprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 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.  */
 #include "vasprintf.h"

diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c
index 00e3025..13b15f9 100644 (file)
--- a/lib/c-strcasecmp.c
+++ b/lib/c-strcasecmp.c
@@ -1,5 +1,5 @@
 /* c-strcasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 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 +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
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "c-strcase.h"

diff --git a/lib/c-strcasestr.c b/lib/c-strcasestr.c
index dc6ff85..12e2e9d 100644 (file)
--- a/lib/c-strcasestr.c
+++ b/lib/c-strcasestr.c
@@ -1,5 +1,5 @@
 /* c-strcasestr.c -- case insensitive substring search in C locale
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software; you can redistribute it and/or modify
@@ -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 "c-strcasestr.h"

diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c
index 2d260ef..274e9b7 100644 (file)
--- a/lib/c-strncasecmp.c
+++ b/lib/c-strncasecmp.c
@@ -1,5 +1,5 @@
 /* c-strncasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 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 +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
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "c-strcase.h"

diff --git a/lib/c-strstr.c b/lib/c-strstr.c
index 0cf97d6..e383fe3 100644 (file)
--- a/lib/c-strstr.c
+++ b/lib/c-strstr.c
@@ -24,9 +24,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  *
  * Stephen R. van den Berg, berg@pool.informatik.rwth-aachen.de        */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 

diff --git a/lib/classpath.c b/lib/classpath.c
index ccb66de..b87ceab 100644 (file)
--- a/lib/classpath.c
+++ b/lib/classpath.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>
 
 /* Specification.  */
 #include "classpath.h"

diff --git a/lib/clean-temp.c b/lib/clean-temp.c
index cffe959..2322e7a 100644 (file)
--- a/lib/clean-temp.c
+++ b/lib/clean-temp.c
@@ -17,9 +17,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "clean-temp.h"

diff --git a/lib/concatpath.c b/lib/concatpath.c
index bdab6aa..d39a1fb 100644 (file)
--- a/lib/concatpath.c
+++ b/lib/concatpath.c
@@ -1,5 +1,5 @@
 /* Construct a full pathname from a directory and a filename.
-   Copyright (C) 2001-2004 Free Software Foundation, Inc.
+   Copyright (C) 2001-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
@@ -18,9 +18,7 @@
 
 /* Written by Bruno Haible <haible@clisp.cons.org>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "pathname.h"

diff --git a/lib/copy-file.c b/lib/copy-file.c
index 21bcfde..ca620dc 100644 (file)
--- a/lib/copy-file.c
+++ b/lib/copy-file.c
@@ -17,9 +17,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "copy-file.h"

diff --git a/lib/csharpcomp.c b/lib/csharpcomp.c
index cbc6520..eed0d15 100644 (file)
--- a/lib/csharpcomp.c
+++ b/lib/csharpcomp.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 <alloca.h>
 
 /* Specification.  */

diff --git a/lib/csharpexec.c b/lib/csharpexec.c
index 6c25ecd..e330718 100644 (file)
--- a/lib/csharpexec.c
+++ b/lib/csharpexec.c
@@ -1,5 +1,5 @@
 /* Execute a C# program.
-   Copyright (C) 2003-2005 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -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 <alloca.h>
 
 /* Specification.  */

diff --git a/lib/execute.c b/lib/execute.c
index df6b1ea..cb72343 100644 (file)
--- a/lib/execute.c
+++ b/lib/execute.c
@@ -17,9 +17,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "execute.h"

diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
index 1c396e0..edf2ea9 100644 (file)
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.c
@@ -17,9 +17,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "fatal-signal.h"

diff --git a/lib/findprog.c b/lib/findprog.c
index f1f7ef1..568c934 100644 (file)
--- a/lib/findprog.c
+++ b/lib/findprog.c
@@ -17,9 +17,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "findprog.h"

diff --git a/lib/fwriteerror.c b/lib/fwriteerror.c
index f010674..4d4ad81 100644 (file)
--- a/lib/fwriteerror.c
+++ b/lib/fwriteerror.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>
 
 /* Specification.  */
 #include "fwriteerror.h"

diff --git a/lib/gl_array_list.c b/lib/gl_array_list.c
index f8010ca..cb39fa0 100644 (file)
--- a/lib/gl_array_list.c
+++ b/lib/gl_array_list.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>
 
 /* Specification.  */
 #include "gl_array_list.h"

diff --git a/lib/gl_array_oset.c b/lib/gl_array_oset.c
index 6bf1de9..329357f 100644 (file)
--- a/lib/gl_array_oset.c
+++ b/lib/gl_array_oset.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>
 
 /* Specification.  */
 #include "gl_array_oset.h"

diff --git a/lib/gl_avltree_list.c b/lib/gl_avltree_list.c
index ed7057d..809b237 100644 (file)
--- a/lib/gl_avltree_list.c
+++ b/lib/gl_avltree_list.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>
 
 /* Specification.  */
 #include "gl_avltree_list.h"

diff --git a/lib/gl_avltree_oset.c b/lib/gl_avltree_oset.c
index e57b4de..ac1185c 100644 (file)
--- a/lib/gl_avltree_oset.c
+++ b/lib/gl_avltree_oset.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>
 
 /* Specification.  */
 #include "gl_avltree_oset.h"

diff --git a/lib/gl_avltreehash_list.c b/lib/gl_avltreehash_list.c
index b74a9a2..d076e94 100644 (file)
--- a/lib/gl_avltreehash_list.c
+++ b/lib/gl_avltreehash_list.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>
 
 /* Specification.  */
 #include "gl_avltreehash_list.h"

diff --git a/lib/gl_carray_list.c b/lib/gl_carray_list.c
index f6c6407..5be0d07 100644 (file)
--- a/lib/gl_carray_list.c
+++ b/lib/gl_carray_list.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>
 
 /* Specification.  */
 #include "gl_carray_list.h"

diff --git a/lib/gl_linked_list.c b/lib/gl_linked_list.c
index e73dd5f..89038aa 100644 (file)
--- a/lib/gl_linked_list.c
+++ b/lib/gl_linked_list.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>
 
 /* Specification.  */
 #include "gl_linked_list.h"

diff --git a/lib/gl_linkedhash_list.c b/lib/gl_linkedhash_list.c
index ca7f707..2faecc3 100644 (file)
--- a/lib/gl_linkedhash_list.c
+++ b/lib/gl_linkedhash_list.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>
 
 /* Specification.  */
 #include "gl_linkedhash_list.h"

diff --git a/lib/gl_list.c b/lib/gl_list.c
index 17c2fd9..546cb75 100644 (file)
--- a/lib/gl_list.c
+++ b/lib/gl_list.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>
 
 /* Specification.  */
 #include "gl_list.h"

diff --git a/lib/gl_oset.c b/lib/gl_oset.c
index bfe1c6d..a673304 100644 (file)
--- a/lib/gl_oset.c
+++ b/lib/gl_oset.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>
 
 /* Specification.  */
 #include "gl_oset.h"

diff --git a/lib/gl_rbtree_list.c b/lib/gl_rbtree_list.c
index 5064515..d9ba446 100644 (file)
--- a/lib/gl_rbtree_list.c
+++ b/lib/gl_rbtree_list.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>
 
 /* Specification.  */
 #include "gl_rbtree_list.h"

diff --git a/lib/gl_rbtree_oset.c b/lib/gl_rbtree_oset.c
index 2ca4fbc..12c8632 100644 (file)
--- a/lib/gl_rbtree_oset.c
+++ b/lib/gl_rbtree_oset.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>
 
 /* Specification.  */
 #include "gl_rbtree_oset.h"

diff --git a/lib/gl_rbtreehash_list.c b/lib/gl_rbtreehash_list.c
index 029b6b4..66ad332 100644 (file)
--- a/lib/gl_rbtreehash_list.c
+++ b/lib/gl_rbtreehash_list.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>
 
 /* Specification.  */
 #include "gl_rbtreehash_list.h"

diff --git a/lib/imaxabs.c b/lib/imaxabs.c
index 7d22c71..2faca65 100644 (file)
--- a/lib/imaxabs.c
+++ b/lib/imaxabs.c
@@ -15,9 +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
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include <inttypes.h>

diff --git a/lib/imaxdiv.c b/lib/imaxdiv.c
index 1bbfe0e..a25666c 100644 (file)
--- a/lib/imaxdiv.c
+++ b/lib/imaxdiv.c
@@ -15,9 +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
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include <inttypes.h>

diff --git a/lib/javacomp.c b/lib/javacomp.c
index 859d072..f3e8a18 100644 (file)
--- a/lib/javacomp.c
+++ b/lib/javacomp.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 <alloca.h>
 
 /* Specification.  */

diff --git a/lib/javaexec.c b/lib/javaexec.c
index c50a30e..1294d7f 100644 (file)
--- a/lib/javaexec.c
+++ b/lib/javaexec.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 <alloca.h>
 
 /* Specification.  */

diff --git a/lib/javaversion.c b/lib/javaversion.c
index a0dea95..80e6df6 100644 (file)
--- a/lib/javaversion.c
+++ b/lib/javaversion.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>
 
 /* Specification.  */
 #include "javaversion.h"

diff --git a/lib/linebreak.c b/lib/linebreak.c
index 594c0d2..82aba3c 100644 (file)
--- a/lib/linebreak.c
+++ b/lib/linebreak.c
@@ -1,5 +1,5 @@
 /* linebreak.c - line breaking of Unicode strings
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
 This program is free software; you can redistribute it and/or modify
@@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software Foundation,
 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "linebreak.h"

diff --git a/lib/localcharset.c b/lib/localcharset.c
index 7a2cdce..a2fc5dc 100644 (file)
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -18,9 +18,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "localcharset.h"

diff --git a/lib/lock.c b/lib/lock.c
index 8487989..34a59ab 100644 (file)
--- a/lib/lock.c
+++ b/lib/lock.c
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   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
@@ -19,9 +19,7 @@
    Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
    gthr-win32.h.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "lock.h"
 

diff --git a/lib/mbchar.c b/lib/mbchar.c
index 6facc14..590109b 100644 (file)
--- a/lib/mbchar.c
+++ b/lib/mbchar.c
@@ -1,4 +1,4 @@
-/* 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
@@ -15,9 +15,7 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <limits.h>
 

diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index 0726951..a207d0f 100644 (file)
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -17,9 +17,7 @@
 
 /* Written by Bruno Haible <haible@clisp.cons.org>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "mbswidth.h"

diff --git a/lib/mkdtemp.c b/lib/mkdtemp.c
index 3228f05..09b015b 100644 (file)
--- a/lib/mkdtemp.c
+++ b/lib/mkdtemp.c
@@ -17,9 +17,7 @@
 
 /* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c.  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "mkdtemp.h"

diff --git a/lib/pipe.c b/lib/pipe.c
index 77643b0..19feaf4 100644 (file)
--- a/lib/pipe.c
+++ b/lib/pipe.c
@@ -17,9 +17,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "pipe.h"

diff --git a/lib/printf-args.c b/lib/printf-args.c
index 7613456..da00c5f 100644 (file)
--- a/lib/printf-args.c
+++ b/lib/printf-args.c
@@ -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.  */
 #include "printf-args.h"

diff --git a/lib/printf-parse.c b/lib/printf-parse.c
index 3d2fb17..d9440f3 100644 (file)
--- a/lib/printf-parse.c
+++ b/lib/printf-parse.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 1999-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
@@ -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/progname.c b/lib/progname.c
index 67ecdff..d3dc8cf 100644 (file)
--- a/lib/progname.c
+++ b/lib/progname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,9 +17,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "progname.h"

diff --git a/lib/progreloc.c b/lib/progreloc.c
index 6986e1e..e9fb647 100644 (file)
--- a/lib/progreloc.c
+++ b/lib/progreloc.c
@@ -17,9 +17,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "progname.h"

diff --git a/lib/readlink.c b/lib/readlink.c
index 875cc97..63b5d5e 100644 (file)
--- a/lib/readlink.c
+++ b/lib/readlink.c
@@ -1,5 +1,5 @@
 /* Stub for readlink().
-   Copyright (C) 2003-2005 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
@@ -15,9 +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
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <errno.h>
 #include <sys/types.h>

diff --git a/lib/sh-quote.c b/lib/sh-quote.c
index 2e35f22..eeef088 100644 (file)
--- a/lib/sh-quote.c
+++ b/lib/sh-quote.c
@@ -1,5 +1,5 @@
 /* Shell quoting.
-   Copyright (C) 2001-2004 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -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 "sh-quote.h"

diff --git a/lib/stpcpy.c b/lib/stpcpy.c
index bb667a0..870fd6d 100644 (file)
--- a/lib/stpcpy.c
+++ b/lib/stpcpy.c
@@ -1,5 +1,5 @@
 /* stpcpy.c -- copy a string and return pointer to end of new string
-   Copyright (C) 1992, 1995, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1995, 1997-1998, 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.
@@ -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 <string.h>
 

diff --git a/lib/stpncpy.c b/lib/stpncpy.c
index 445128a..9c0b167 100644 (file)
--- a/lib/stpncpy.c
+++ b/lib/stpncpy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995-1997, 2002-2003, 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@gnu.org.
@@ -19,9 +19,7 @@
 
 /* This is almost copied from strncpy.c, written by Torbjorn Granlund.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "stpncpy.h"

diff --git a/lib/strcasecmp.c b/lib/strcasecmp.c
index c1bac0a..99d5dd2 100644 (file)
--- a/lib/strcasecmp.c
+++ b/lib/strcasecmp.c
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison function.
-   Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005,
    based on earlier glibc code.
 
@@ -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.  */
 #include "strcase.h"

diff --git a/lib/strcasestr.c b/lib/strcasestr.c
index 64291a1..6812b5d 100644 (file)
--- a/lib/strcasestr.c
+++ b/lib/strcasestr.c
@@ -1,5 +1,5 @@
 /* Case-insensitive searching in a string.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software; you can redistribute it and/or modify
@@ -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 "strcasestr.h"

diff --git a/lib/strcspn.c b/lib/strcspn.c
index 46d7d36..5a8d6f9 100644 (file)
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 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@gnu.org.
@@ -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 <stddef.h>
 #include <string.h>

diff --git a/lib/striconv.c b/lib/striconv.c
index 4ca9839..c97d5a0 100644 (file)
--- a/lib/striconv.c
+++ b/lib/striconv.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>
 
 /* Specification.  */
 #include "striconv.h"

diff --git a/lib/strncasecmp.c b/lib/strncasecmp.c
index 0209c39..f59b953 100644 (file)
--- a/lib/strncasecmp.c
+++ b/lib/strncasecmp.c
@@ -1,5 +1,5 @@
 /* strncasecmp.c -- case insensitive string comparator
-   Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 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 +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
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "strcase.h"

diff --git a/lib/strnlen1.c b/lib/strnlen1.c
index 9b0032c..f74e427 100644 (file)
--- a/lib/strnlen1.c
+++ b/lib/strnlen1.c
@@ -1,5 +1,5 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
-   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
@@ -15,9 +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
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "strnlen1.h"

diff --git a/lib/strstr.c b/lib/strstr.c
index e94cef7..f1e2ef6 100644 (file)
--- a/lib/strstr.c
+++ b/lib/strstr.c
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software; you can redistribute it and/or modify
@@ -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 "strstr.h"

diff --git a/lib/strtok_r.c b/lib/strtok_r.c
index d1522c9..487737d 100644 (file)
--- a/lib/strtok_r.c
+++ b/lib/strtok_r.c
@@ -1,5 +1,5 @@
 /* Reentrant string tokenizer.  Generic version.
-   Copyright (C) 1991,1996-1999,2001,2004 Free Software Foundation, Inc.
+   Copyright (C) 1991,1996-1999,2001,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
@@ -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 <string.h>
 

diff --git a/lib/tls.c b/lib/tls.c
index 567fdac..795c638 100644 (file)
--- a/lib/tls.c
+++ b/lib/tls.c
@@ -1,5 +1,5 @@
 /* Thread-local storage in multithreaded situations.
-   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 +17,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "tls.h"
 

diff --git a/lib/tmpdir.c b/lib/tmpdir.c
index f32fb62..3e22eef 100644 (file)
--- a/lib/tmpdir.c
+++ b/lib/tmpdir.c
@@ -17,9 +17,7 @@
 
 /* Extracted from sysdeps/posix/tempname.c.  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "tmpdir.h"

diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index 54cae55..0967c99 100644 (file)
--- 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/unsetenv.c b/lib/unsetenv.c
index b26bd8d..0f83744 100644 (file)
--- a/lib/unsetenv.c
+++ b/lib/unsetenv.c
@@ -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>
 
 #include <errno.h>
 #if !_LIBC

diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index b68c1bb..345aa8a 100644 (file)
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -22,9 +22,7 @@
 # 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/vasprintf.c b/lib/vasprintf.c
index 91da881..8247073 100644 (file)
--- a/lib/vasprintf.c
+++ b/lib/vasprintf.c
@@ -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.  */
 #include "vasprintf.h"

diff --git a/lib/wait-process.c b/lib/wait-process.c
index bca1dc4..7593eea 100644 (file)
--- a/lib/wait-process.c
+++ b/lib/wait-process.c
@@ -1,5 +1,5 @@
 /* Waiting for a subprocess to finish.
-   Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,9 +17,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "wait-process.h"

diff --git a/lib/xallocsa.c b/lib/xallocsa.c
index 8cf70fd..c69128a 100644 (file)
--- a/lib/xallocsa.c
+++ b/lib/xallocsa.c
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation with out of memory checking.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -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 "xallocsa.h"

diff --git a/lib/xsetenv.c b/lib/xsetenv.c
index 547ebd3..83ef48e 100644 (file)
--- a/lib/xsetenv.c
+++ b/lib/xsetenv.c
@@ -1,5 +1,5 @@
 /* Setting environment variables, with out-of-memory checking.
-   Copyright (C) 2001-2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 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 +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
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "xsetenv.h"

diff --git a/lib/xstriconv.c b/lib/xstriconv.c
index 5657eda..29e76df 100644 (file)
--- a/lib/xstriconv.c
+++ b/lib/xstriconv.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>
 
 /* Specification.  */
 #include "xstriconv.h"