Include <config.h> unconditionally.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 6e1b38d547621be7c9a7f76abb18cb42c14f44c0..43e2e788c6b6d5a90b414f4d340c1c021ac0d799 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-14  Bruno Haible  <bruno@clisp.org>
+
+       * localcharset.c: Include <config.h> unconditionally.
+
 2006-09-10  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.in (install_sh): New variable.

diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c
index 4f5e4ea412df49233e08758ff15a03b38e6287d3..73f7cc6455b312943a2a073ace809b8928b46b35 100644 (file)
--- a/gettext-runtime/intl/localcharset.c
+++ b/gettext-runtime/intl/localcharset.c
@@ -19,9 +19,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/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 1a9ab28b0dd924ac162bf84291c13a5d3aaec30f..9fb58474ee21f499a4ef4ba868d044c5bab19a1b 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-14  Bruno Haible  <bruno@clisp.org>
+
+       * lib-asprintf.c: Include <config.h> unconditionally.
+       * asnprintf.c: Likewise.
+       * asprintf.c: Likewise.
+       * printf-args.c: Likewise.
+       * printf-parse.c: Likewise.
+       * vasnprintf.c: Likewise.
+       * vasprintf.c: Likewise.
+
 2006-08-26  Bruno Haible  <bruno@clisp.org>
 
        * vasnprintf.c (EOVERFLOW): Remove definition.

diff --git a/gettext-runtime/libasprintf/asnprintf.c b/gettext-runtime/libasprintf/asnprintf.c
index ca3dd8e64c1b4e8750aa9eaa84d49aad2896cd10..951e3c61abbf392b36fadc06df6634ab21f65b77 100644 (file)
--- a/gettext-runtime/libasprintf/asnprintf.c
+++ b/gettext-runtime/libasprintf/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 Library General Public License as published
@@ -16,9 +16,7 @@
    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/gettext-runtime/libasprintf/asprintf.c b/gettext-runtime/libasprintf/asprintf.c
index f50724879241d13bb42d9d59fd3c7ccc4625be0b..79a03b00e9795c9836a690d9ba08e7ce34140b7b 100644 (file)
--- a/gettext-runtime/libasprintf/asprintf.c
+++ b/gettext-runtime/libasprintf/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 Library General Public License as published
@@ -16,9 +16,7 @@
    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/gettext-runtime/libasprintf/lib-asprintf.c b/gettext-runtime/libasprintf/lib-asprintf.c
index 38ce7b29d8b61b58d90de07f91cdc16b99604c13..80d89fb0ec61f723be3bbd9ffa1ed6b7905a6f09 100644 (file)
--- a/gettext-runtime/libasprintf/lib-asprintf.c
+++ b/gettext-runtime/libasprintf/lib-asprintf.c
@@ -1,5 +1,5 @@
 /* Library functions for class autosprintf.
-   Copyright (C) 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software; you can redistribute it and/or modify it
@@ -17,9 +17,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #if !(HAVE_VASPRINTF && HAVE_POSIX_PRINTF)
 

diff --git a/gettext-runtime/libasprintf/printf-args.c b/gettext-runtime/libasprintf/printf-args.c
index 47b73d2c1dee4d8676d26a7b2063cbb39bb14330..bf634d6c4088fd2952f737e1050c9cef82b69439 100644 (file)
--- a/gettext-runtime/libasprintf/printf-args.c
+++ b/gettext-runtime/libasprintf/printf-args.c
@@ -16,9 +16,7 @@
    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/gettext-runtime/libasprintf/printf-parse.c b/gettext-runtime/libasprintf/printf-parse.c
index 20240e3790d3673618015190ff0aadfd6d8f8786..503d8121b76d855283c0dc48fb8cb66173e1976b 100644 (file)
--- a/gettext-runtime/libasprintf/printf-parse.c
+++ b/gettext-runtime/libasprintf/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 Library General Public License as published
@@ -16,9 +16,7 @@
    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/gettext-runtime/libasprintf/vasnprintf.c b/gettext-runtime/libasprintf/vasnprintf.c
index 08a47836ad2dea475aef96541944132bf451d239..bc0f53af5401b7edb4e1c7ecbd21f1957c5f9e13 100644 (file)
--- a/gettext-runtime/libasprintf/vasnprintf.c
+++ b/gettext-runtime/libasprintf/vasnprintf.c
@@ -23,9 +23,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/gettext-runtime/libasprintf/vasprintf.c b/gettext-runtime/libasprintf/vasprintf.c
index feb8b25b6a4d34437badc70f3e35d36bce165854..34117059f2f7c4ca8ad22a7345c878857651e539 100644 (file)
--- a/gettext-runtime/libasprintf/vasprintf.c
+++ b/gettext-runtime/libasprintf/vasprintf.c
@@ -16,9 +16,7 @@
    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/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index fcf308845513c2d849d441bad44d18afdf295130..4e69105a0250d894e6d494d85248a23b437d41ac 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,25 @@
+2006-09-14  Bruno Haible  <bruno@clisp.org>
+
+       * lib/addext.c: Include <config.h> unconditionally.
+       * lib/backupfile.c: Likewise.
+       * lib/basename.c: Likewise.
+       * lib/canonicalize.c: Likewise.
+       * lib/closeout.c: Likewise.
+       * lib/error-progname.c: Likewise.
+       * lib/fstrcmp.c: Likewise.
+       * lib/getline.c: Likewise.
+       * lib/getndelim2.c: Likewise.
+       * lib/hash.c: Likewise.
+       * lib/propername.c: Likewise.
+       * lib/relocatable.c: Likewise.
+       * lib/relocwrapper.c: Likewise.
+       * lib/vasprintf.c: Likewise.
+       * lib/xerror.c: Likewise.
+       * lib/xgetcwd.c: Likewise.
+       * lib/xmalloc.c: Likewise.
+       * lib/xreadlink.c: Likewise.
+       * lib/xstrdup.c: Likewise.
+
 2006-09-09  Bruno Haible  <bruno@clisp.org>
 
        * modules/gettext-tools-misc (Makefile.am): Augment lib_LDFLAGS

diff --git a/gnulib-local/lib/addext.c b/gnulib-local/lib/addext.c
index e81e5680a9d755ecaa440eaff6dd0fd3cbac3c63..68bf65e91f32d443b9c5fc21bc99f0ab0cbd205f 100644 (file)
--- a/gnulib-local/lib/addext.c
+++ b/gnulib-local/lib/addext.c
@@ -18,9 +18,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> and Paul Eggert */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #ifndef HAVE_DOS_FILE_NAMES
 # define HAVE_DOS_FILE_NAMES 0

diff --git a/gnulib-local/lib/backupfile.c b/gnulib-local/lib/backupfile.c
index 7e1091ea9021ecccc07febea83ce43e7801f9d49..25ee1194158b52fb9912159213ea8d0fa9d04c12 100644 (file)
--- a/gnulib-local/lib/backupfile.c
+++ b/gnulib-local/lib/backupfile.c
@@ -19,9 +19,7 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.
    Some algorithms adapted from GNU Emacs. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "argmatch.h"
 #include "backupfile.h"

diff --git a/gnulib-local/lib/basename.c b/gnulib-local/lib/basename.c
index 6a83148329b19bcf1861b44cb67eb7511b52fc3d..ff4ea8a122066aa1c81a2895c0b8ac856495cfa7 100644 (file)
--- a/gnulib-local/lib/basename.c
+++ b/gnulib-local/lib/basename.c
@@ -1,5 +1,5 @@
 /* Return the name-within-directory of a file name.
-   Copyright (C) 1996-1999, 2000-2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2000-2002, 2004, 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 @@
    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 "basename.h"

diff --git a/gnulib-local/lib/canonicalize.c b/gnulib-local/lib/canonicalize.c
index d2e8a672a252a4dc87093ed8472a7f47bbb77c6e..2eadede5072ffa377ff2f8ce19a71187a9efa22a 100644 (file)
--- a/gnulib-local/lib/canonicalize.c
+++ b/gnulib-local/lib/canonicalize.c
@@ -1,5 +1,5 @@
 /* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-2003, 2005-2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,9 +17,7 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Avoid a clash of our rpl_realpath() function with the prototype in
    <stdlib.h> on Solaris 2.5.1.  */

diff --git a/gnulib-local/lib/closeout.c b/gnulib-local/lib/closeout.c
index 21f81b2efb423ac95a96b7f7134f8e490165ce15..4a6c70737ef147c9aa5f410d0cd441c3ac6a64f6 100644 (file)
--- a/gnulib-local/lib/closeout.c
+++ b/gnulib-local/lib/closeout.c
@@ -1,5 +1,5 @@
 /* closeout.c - close standard output
-   Copyright (C) 1998-2005 Free Software Foundation, Inc.
+   Copyright (C) 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 +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 "closeout.h"

diff --git a/gnulib-local/lib/error-progname.c b/gnulib-local/lib/error-progname.c
index 7bc76fdc2a2259765341f294cf17a8e2fd3d1268..6d44dac643f252fa0116d0e2521f992fd7a67b12 100644 (file)
--- a/gnulib-local/lib/error-progname.c
+++ b/gnulib-local/lib/error-progname.c
@@ -1,5 +1,5 @@
 /* Use of program name in error-reporting functions.
-   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
@@ -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 "error-progname.h"

diff --git a/gnulib-local/lib/fstrcmp.c b/gnulib-local/lib/fstrcmp.c
index dadc82b4076358e62e585a57b5b75379c9aa114f..9bd742996863fc783a74e2b8794191720f2ea8dd 100644 (file)
--- a/gnulib-local/lib/fstrcmp.c
+++ b/gnulib-local/lib/fstrcmp.c
@@ -43,9 +43,7 @@
    Modified to work on strings rather than files
    by Peter Miller <pmiller@agso.gov.au>, October 1995 */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "fstrcmp.h"

diff --git a/gnulib-local/lib/getline.c b/gnulib-local/lib/getline.c
index 4e61d16da9f780c2927f7c8943bbe52d6f1cb4dd..9b188ff220b91065439e02d2532cf3613888cf17 100644 (file)
--- a/gnulib-local/lib/getline.c
+++ b/gnulib-local/lib/getline.c
@@ -1,6 +1,6 @@
 /* getline.c -- Replacement for GNU C library function getline
 
-   Copyright (C) 1993, 1996-1998, 2000, 2003, 2005 Free Software
+   Copyright (C) 1993, 1996-1998, 2000, 2003, 2005-2006 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,7 @@
 
 /* Written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "getline.h"

diff --git a/gnulib-local/lib/getndelim2.c b/gnulib-local/lib/getndelim2.c
index 5c97e66109d2b39caa3c1287ea1fe4b73e635735..a96da2ec2b8c3b1d159cf0151cb36079256cf3d2 100644 (file)
--- a/gnulib-local/lib/getndelim2.c
+++ b/gnulib-local/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>
 
 /* Specification.  */
 #include "getndelim2.h"

diff --git a/gnulib-local/lib/hash.c b/gnulib-local/lib/hash.c
index 792610247cb5cb4cf591954c2a324bd9a78592c6..abc3a42f8cf62da96506cd36f74607e208306cdc 100644 (file)
--- a/gnulib-local/lib/hash.c
+++ b/gnulib-local/lib/hash.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 "hash.h"

diff --git a/gnulib-local/lib/propername.c b/gnulib-local/lib/propername.c
index 56c4bc7cd8fb65b1d9069d6e09c02ce5ef688a35..0eda923a4fe7ebeb7d89bbfaa9f6350481541ae2 100644 (file)
--- a/gnulib-local/lib/propername.c
+++ b/gnulib-local/lib/propername.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 "propername.h"

diff --git a/gnulib-local/lib/relocatable.c b/gnulib-local/lib/relocatable.c
index 7cc8daf77cc6a88f82d2e24bfc5a046aa60d6de6..5e1dde6c8dc7c15fd588f2142c9229b3e7def336 100644 (file)
--- a/gnulib-local/lib/relocatable.c
+++ b/gnulib-local/lib/relocatable.c
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   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 it
@@ -25,9 +25,7 @@
 # define _GNU_SOURCE   1
 #endif
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "relocatable.h"

diff --git a/gnulib-local/lib/relocwrapper.c b/gnulib-local/lib/relocwrapper.c
index aae6ea4bb398c7e171bbaf01fb9fb3016fa25836..c303803a8256cec8fa4cfda8331c737976618e8c 100644 (file)
--- a/gnulib-local/lib/relocwrapper.c
+++ b/gnulib-local/lib/relocwrapper.c
@@ -1,5 +1,5 @@
 /* Relocating wrapper program.
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-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
@@ -42,9 +42,7 @@
    libc functions, no gettext(), no error(), no xmalloc(), no xsetenv().
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/gnulib-local/lib/vasprintf.c b/gnulib-local/lib/vasprintf.c
index f2c6138b991ae1886dcd5398636d2dfc69fcded2..f7978e6f2b5bb52104a528fcabed69382147f7d1 100644 (file)
--- a/gnulib-local/lib/vasprintf.c
+++ b/gnulib-local/lib/vasprintf.c
@@ -1,6 +1,6 @@
 /* Like vsprintf but provides a pointer to malloc'd storage, which must
    be freed by the caller.
-   Copyright (C) 1994, 1998, 1999, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1998, 1999, 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 @@ 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 "vasprintf.h"

diff --git a/gnulib-local/lib/xerror.c b/gnulib-local/lib/xerror.c
index b1bb66d3ff5cc62f689120b60280ca073e490560..3727174c522891e89c6ebd4f4e701f494f3fc48d 100644 (file)
--- a/gnulib-local/lib/xerror.c
+++ b/gnulib-local/lib/xerror.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 "xerror.h"

diff --git a/gnulib-local/lib/xgetcwd.c b/gnulib-local/lib/xgetcwd.c
index f7998412e6c7d8436c6c9405aa24f7bf1de9fd8a..566c899c8122871db9f5693ce88a03867b98771e 100644 (file)
--- a/gnulib-local/lib/xgetcwd.c
+++ b/gnulib-local/lib/xgetcwd.c
@@ -17,9 +17,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/gnulib-local/lib/xmalloc.c b/gnulib-local/lib/xmalloc.c
index 98550b56f8c3afa59a721d6b2dae1521fd2cff16..8f06d891d0e9100ed7fd38d7e03f438cf6b96ea9 100644 (file)
--- a/gnulib-local/lib/xmalloc.c
+++ b/gnulib-local/lib/xmalloc.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 "xalloc.h"

diff --git a/gnulib-local/lib/xreadlink.c b/gnulib-local/lib/xreadlink.c
index 0331f39bb1048cef5e9fdcb6eb537b11938e6d5b..44e372eeef690fde8f0a6cad081936e7f0c0dc01 100644 (file)
--- a/gnulib-local/lib/xreadlink.c
+++ b/gnulib-local/lib/xreadlink.c
@@ -20,9 +20,7 @@
 /* Written by Jim Meyering <jim@meyering.net>
    and Bruno Haible <bruno@clisp.org>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "xreadlink.h"

diff --git a/gnulib-local/lib/xstrdup.c b/gnulib-local/lib/xstrdup.c
index d406979c7feabd0660efedc4d375adddfb85a217..d73a179c6ae539169799d1b57fa2dfb78bc67d2b 100644 (file)
--- a/gnulib-local/lib/xstrdup.c
+++ b/gnulib-local/lib/xstrdup.c
@@ -1,5 +1,5 @@
 /* xstrdup.c -- copy a string with out of memory checking
-   Copyright (C) 1990, 1996, 2000-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1996, 2000-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 +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 "xalloc.h"