Test HAVE_CONFIG_H using #ifdef.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index a3b2782aed5617376853f8d8c16290a62cc74d53..e056f12131271e7002678731da176d1fc9d71151 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,38 @@
+2005-10-06  Bruno Haible  <bruno@clisp.org>
+
+       * addext.c: Test HAVE_CONFIG_H using #ifdef.
+       * argmatch.c: Likewise.
+       * backupfile.c: Likewise.
+       * c-strcasecmp.c: Likewise.
+       * c-strncasecmp.c: Likewise.
+       * canonicalize.c: Likewise.
+       * closeout.c: Likewise.
+       * exitfail.c: Likewise.
+       * fnmatch.c: Likewise.
+       * full-write.c: Likewise.
+       * fwriteerror.c: Likewise.
+       * getline.c: Likewise.
+       * getndelim2.c: Likewise.
+       * getopt_.h: Likewise.
+       * hash.c: Likewise.
+       * memmove.c: Likewise.
+       * quote.c: Likewise.
+       * quotearg.c: Likewise.
+       * readlink.c: Likewise.
+       * safe-read.c: Likewise.
+       * setenv.c: Likewise.
+       * strcspn.c: Likewise.
+       * strerror.c: Likewise.
+       * strstr.c: Likewise.
+       * strtol.c: Likewise.
+       * unsetenv.c: Likewise.
+       * xgetcwd.c: Likewise.
+       * xmalloc.c: Likewise.
+       * xreadlink.c: Likewise.
+       * xsetenv.c: Likewise.
+       * xstrdup.c: Likewise.
+       Reported by Ralf Wildenhues on bug-gnulib.
+
 2005-10-03  Bruno Haible  <bruno@clisp.org>
 
        * hash.h (hash_insert_entry): Return a pointer instead of int.

diff --git a/gettext-tools/lib/addext.c b/gettext-tools/lib/addext.c
index 550a610e63468d2e7fd67579d1381df6aee4742d..c6c2ac31f72258a03267dfe7c80bccadb7478c29 100644 (file)
--- a/gettext-tools/lib/addext.c
+++ b/gettext-tools/lib/addext.c
@@ -1,5 +1,5 @@
 /* addext.c -- add an extension to a file name
-   Copyright (C) 1990, 1997-1999, 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997-1999, 2001-2003, 2005 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,7 +18,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> and Paul Eggert */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/argmatch.c b/gettext-tools/lib/argmatch.c
index 20c603bc72f626620931fbf61390cce60e3c52c3..38ec7a80df3dec5718c7bd6b6df01002d886333f 100644 (file)
--- a/gettext-tools/lib/argmatch.c
+++ b/gettext-tools/lib/argmatch.c
@@ -1,7 +1,6 @@
 /* argmatch.c -- find a match for a string in an array
 
-   Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003, 2004 Free
-   Software Foundation, Inc.
+   Copyright (C) 1990, 1998-1999, 2001-2005 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,7 +19,7 @@
 /* Written by David MacKenzie <djm@ai.mit.edu>
    Modified by Akim Demaille <demaille@inf.enst.fr> */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/backupfile.c b/gettext-tools/lib/backupfile.c
index 9105916a337a2a15caaa8a4561d5da84a5610674..173c5e02aea2a509035999ac285d42ca1864f18b 100644 (file)
--- a/gettext-tools/lib/backupfile.c
+++ b/gettext-tools/lib/backupfile.c
@@ -1,5 +1,5 @@
 /* backupfile.c -- make Emacs style backup file names
-   Copyright (C) 1990-1999, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1990-1999, 2000-2003, 2005 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,7 +19,7 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.
    Some algorithms adapted from GNU Emacs. */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/c-strcasecmp.c b/gettext-tools/lib/c-strcasecmp.c
index 420ec28c015dfbfe496b91acbf548b3c1feed677..2e3012e4d977265f5482ad8fb6a35c59b501f25c 100644 (file)
--- a/gettext-tools/lib/c-strcasecmp.c
+++ b/gettext-tools/lib/c-strcasecmp.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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/c-strncasecmp.c b/gettext-tools/lib/c-strncasecmp.c
index 90d2b26d330b152771f0dc347db3927d556f5b56..33e8091b760f23bd6d421208f0732e1b1420b575 100644 (file)
--- a/gettext-tools/lib/c-strncasecmp.c
+++ b/gettext-tools/lib/c-strncasecmp.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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/canonicalize.c b/gettext-tools/lib/canonicalize.c
index 588e84a4f3fdc8c6b4e35e7678596d810ef0b766..d2e8a672a252a4dc87093ed8472a7f47bbb77c6e 100644 (file)
--- a/gettext-tools/lib/canonicalize.c
+++ b/gettext-tools/lib/canonicalize.c
@@ -17,7 +17,7 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/closeout.c b/gettext-tools/lib/closeout.c
index 54b4a4785004a4da1d4ff4fc4edab3230eea26d3..21f81b2efb423ac95a96b7f7134f8e490165ce15 100644 (file)
--- a/gettext-tools/lib/closeout.c
+++ b/gettext-tools/lib/closeout.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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/exitfail.c b/gettext-tools/lib/exitfail.c
index 1c5997b8ac5e3d7461b98acd8871d68677df2a96..24df22851eb79f33010551b2cd53660add40950a 100644 (file)
--- a/gettext-tools/lib/exitfail.c
+++ b/gettext-tools/lib/exitfail.c
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2005 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,7 +17,7 @@
    If not, write to the Free Software Foundation,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/fnmatch.c b/gettext-tools/lib/fnmatch.c
index 60031e9b8b4c9e9f784576ba72a52d07e9b4170f..80b8572590834a8d5e5ae9317c0748633717c451 100644 (file)
--- a/gettext-tools/lib/fnmatch.c
+++ b/gettext-tools/lib/fnmatch.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2004
-       Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993,1996-1999,2000-2005 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,7 +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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/full-write.c b/gettext-tools/lib/full-write.c
index 9626027420f3bf86153f7531e8abafdf08f03c71..660e92e63cc0e4bf4d9f3d2a035a57ec76da3bbf 100644 (file)
--- a/gettext-tools/lib/full-write.c
+++ b/gettext-tools/lib/full-write.c
@@ -1,7 +1,6 @@
 /* An interface to read and write that retries (if necessary) until complete.
 
-   Copyright (C) 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1997-1999, 2000-2005 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,7 +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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/fwriteerror.c b/gettext-tools/lib/fwriteerror.c
index 6ffdf526d9b112dd67fe85e3f35609f893dc8add..a88c8e1c3965db0d5d36bf9cb1d7320ae3090c57 100644 (file)
--- a/gettext-tools/lib/fwriteerror.c
+++ b/gettext-tools/lib/fwriteerror.c
@@ -16,7 +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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

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

diff --git a/gettext-tools/lib/getndelim2.c b/gettext-tools/lib/getndelim2.c
index cc4d42b1ccf16e2e95d450c1702a01a70a544149..5adcabb66706ed2ec0dc3daf56c00589cec2411b 100644 (file)
--- a/gettext-tools/lib/getndelim2.c
+++ b/gettext-tools/lib/getndelim2.c
@@ -1,7 +1,7 @@
 /* getndelim2 - Read a line from a stream, stopping at one of 2 delimiters,
    with bounded memory allocation.
 
-   Copyright (C) 1993, 1996, 1997, 1998, 2000, 2003 Free Software
+   Copyright (C) 1993, 1996-1998, 2000, 2003, 2005 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 
 /* Originally written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/getopt_.h b/gettext-tools/lib/getopt_.h
index 7314a6b8893adb0bec36a909ecbf4d3a102848ef..acc70fe6006649cd108e819886f105a068d82763 100644 (file)
--- a/gettext-tools/lib/getopt_.h
+++ b/gettext-tools/lib/getopt_.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
+   Copyright (C) 1989-1994,1996-1999,2001,2003-2005
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -27,7 +27,7 @@
    <stdlib.h> includes <getopt.h>, and <config.h> is not a prerequisite for
    using <stdlib.h>, this file can be included without a prior
    "#include <config.h>".  */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/hash.c b/gettext-tools/lib/hash.c
index 21374f25f86cfd139af39c97358b8a166ab98e18..4ffd83baaa346419eeced32794e3ea989696a346 100644 (file)
--- a/gettext-tools/lib/hash.c
+++ b/gettext-tools/lib/hash.c
@@ -16,7 +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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/memmove.c b/gettext-tools/lib/memmove.c
index 79cc7827396c0ffbe75e932f8b9d93a27994b6e1..753c899d387adf0177cb0cba0f5ef0f43e6ff759 100644 (file)
--- a/gettext-tools/lib/memmove.c
+++ b/gettext-tools/lib/memmove.c
@@ -3,7 +3,7 @@
    In the public domain.
    By David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/quote.c b/gettext-tools/lib/quote.c
index 4c75029a337e880fe3b113c76e56e119a612c3f3..f191e8d7c270fa63accfc73edcfd2522ab66855e 100644 (file)
--- a/gettext-tools/lib/quote.c
+++ b/gettext-tools/lib/quote.c
@@ -1,5 +1,5 @@
 /* quote.c - quote arguments for output
-   Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2000-2001, 2003, 2005 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,7 +17,7 @@
 
 /* Written by Paul Eggert <eggert@twinsun.com> */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/quotearg.c b/gettext-tools/lib/quotearg.c
index 13fcf0b516a65cbe880b3b51e4c2c886ced598f9..3c8cbb16af3b7236d4f5e0eb2e77511810266c3a 100644 (file)
--- a/gettext-tools/lib/quotearg.c
+++ b/gettext-tools/lib/quotearg.c
@@ -1,7 +1,6 @@
 /* quotearg.c - quote arguments for output
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998-1999, 2000-2002, 2004-2005 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,7 +18,7 @@
 
 /* Written by Paul Eggert <eggert@twinsun.com> */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/readlink.c b/gettext-tools/lib/readlink.c
index bf8a5f7830936285699daf85c51169072a3dceb3..875cc9736d92baa3cc542b75a413632c2ccccf3c 100644 (file)
--- a/gettext-tools/lib/readlink.c
+++ b/gettext-tools/lib/readlink.c
@@ -1,5 +1,5 @@
 /* Stub for readlink().
-   Copyright (C) 2003-2004 Free Software Foundation, Inc.
+   Copyright (C) 2003-2005 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,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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/safe-read.c b/gettext-tools/lib/safe-read.c
index 904fc71f03b69a072b24c19ab4b580129bd70c62..ac58a8ea9be63eceee5ca8fb022ed938fe8fdb1d 100644 (file)
--- a/gettext-tools/lib/safe-read.c
+++ b/gettext-tools/lib/safe-read.c
@@ -1,7 +1,6 @@
 /* An interface to read and write that retries after interrupts.
 
-   Copyright (C) 1993, 1994, 1998, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993-1994, 1998, 2002-2005 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,7 +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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/setenv.c b/gettext-tools/lib/setenv.c
index 65d1b9ba2e290339e39eeb37dd60320b47ebd0ba..c385708b1c73015a26ef649cd2a7e830d85b1bf2 100644 (file)
--- a/gettext-tools/lib/setenv.c
+++ b/gettext-tools/lib/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2003 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2003,2005 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
@@ -16,7 +16,7 @@
    write to the Free Software Foundation, Inc., 51 Franklin Street,
    Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #include <alloca.h>

diff --git a/gettext-tools/lib/strcspn.c b/gettext-tools/lib/strcspn.c
index 0efa22f6ba8c3581100493a4ec2b217bd7455e5a..46d7d36ca5553deaf0dd974d94c7e58980bd3849 100644 (file)
--- a/gettext-tools/lib/strcspn.c
+++ b/gettext-tools/lib/strcspn.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 2005 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,7 +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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/strerror.c b/gettext-tools/lib/strerror.c
index ccfd235fb4c2ff9fed1071cb3417a9a49560d3ed..1815bdedebef6cf4951fb83cb416394c638532b2 100644 (file)
--- a/gettext-tools/lib/strerror.c
+++ b/gettext-tools/lib/strerror.c
@@ -1,6 +1,6 @@
 /* strerror.c --- ANSI C compatible system error routine
 
-   Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003 Free Software
+   Copyright (C) 1986, 1988-1989, 1991, 2002-2003, 2005 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,7 +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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/strstr.c b/gettext-tools/lib/strstr.c
index 59614de5105d493fac34a581fcf3a98819b2591a..6326d85aed25ec61d45979f0bf8e950fdc58f533 100644 (file)
--- a/gettext-tools/lib/strstr.c
+++ b/gettext-tools/lib/strstr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1999, 2002-2003 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1999, 2002-2003, 2005 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
@@ -24,7 +24,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  *
  * Stephen R. van den Berg, berg@pool.informatik.rwth-aachen.de        */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/strtol.c b/gettext-tools/lib/strtol.c
index 206be3beac113df70957dadff78174a8dcb519bc..15d510a07497c1338a666c0c69fc98af48cec955 100644 (file)
--- a/gettext-tools/lib/strtol.c
+++ b/gettext-tools/lib/strtol.c
@@ -1,7 +1,6 @@
 /* Convert string representation of a number into an integer value.
 
-   Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2003
-   Free Software Foundation, Inc.
+   Copyright (C) 1991-1992, 1994-1999, 2003, 2005 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.
@@ -20,7 +19,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/unsetenv.c b/gettext-tools/lib/unsetenv.c
index 91fc12c394ac6d73bcaee884d25b3bacbd5f86e7..332dd38c4fe4390292d732ad7cda3d5014e18658 100644 (file)
--- a/gettext-tools/lib/unsetenv.c
+++ b/gettext-tools/lib/unsetenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2002,2005 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
@@ -16,7 +16,7 @@
    write to the Free Software Foundation, Inc., 51 Franklin Street,
    Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/xgetcwd.c b/gettext-tools/lib/xgetcwd.c
index ee555265ca4abf5b5650482ad73cd024933ca2fd..9d475e91b5f8c086ebee13870665498ade03577d 100644 (file)
--- a/gettext-tools/lib/xgetcwd.c
+++ b/gettext-tools/lib/xgetcwd.c
@@ -1,5 +1,5 @@
 /* xgetcwd.c -- return current directory with unlimited length
-   Copyright (C) 1992, 1996, 2000, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1996, 2000, 2003, 2005 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,7 +17,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/xmalloc.c b/gettext-tools/lib/xmalloc.c
index 79efc95438c02fee184334597f1dcd3fd7f2d176..886dd7d52e29930bd3a95670a9cce03375969ebb 100644 (file)
--- a/gettext-tools/lib/xmalloc.c
+++ b/gettext-tools/lib/xmalloc.c
@@ -1,5 +1,5 @@
 /* xmalloc.c -- malloc with out of memory checking
-   Copyright (C) 1990-1996, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1990-1996, 2000-2003, 2005 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,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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/xreadlink.c b/gettext-tools/lib/xreadlink.c
index 54be80d0eade0ec9b7dd914cba18e6042f7bfa17..bb190fe2857fc94b2c1be252865b21e637bda99a 100644 (file)
--- a/gettext-tools/lib/xreadlink.c
+++ b/gettext-tools/lib/xreadlink.c
@@ -1,6 +1,6 @@
 /* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
 
-   Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005 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,7 +20,7 @@
 /* Written by Jim Meyering <jim@meyering.net>
    and Bruno Haible <bruno@clisp.org>.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/xsetenv.c b/gettext-tools/lib/xsetenv.c
index 3e5938650a33352972b6b9ddf35ab74b0a1445a8..547ebd3ae416d51dd0149bcb203553e162dd71ca 100644 (file)
--- a/gettext-tools/lib/xsetenv.c
+++ b/gettext-tools/lib/xsetenv.c
@@ -1,5 +1,5 @@
 /* Setting environment variables, with out-of-memory checking.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005 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,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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/lib/xstrdup.c b/gettext-tools/lib/xstrdup.c
index 28c2661b640ccc1de0a3ccefaa518c4812eac8b3..d406979c7feabd0660efedc4d375adddfb85a217 100644 (file)
--- a/gettext-tools/lib/xstrdup.c
+++ b/gettext-tools/lib/xstrdup.c
@@ -1,5 +1,5 @@
 /* xstrdup.c -- copy a string with out of memory checking
-   Copyright (C) 1990, 1996, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1996, 2000-2003, 2005 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,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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/libgrep/ChangeLog b/gettext-tools/libgrep/ChangeLog
index 9e2b7e5131b26fe4a06ab05afb6e82f22d042820..7b3a647e5f7e8df1e4d3c710fcd3de0569b8031c 100644 (file)
--- a/gettext-tools/libgrep/ChangeLog
+++ b/gettext-tools/libgrep/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-06  Bruno Haible  <bruno@clisp.org>
+
+       * hard-locale.c: Test HAVE_CONFIG_H using #ifdef.
+       * m-common.c: Likewise.
+       * m-fgrep.c: Likewise.
+       * m-regex.c: Likewise.
+       Reported by Ralf Wildenhues on bug-gnulib.
+
 2005-04-18  Bruno Haible  <bruno@clisp.org>
 
        * dfa.c (update_mb_len_index): Change argument type to 'const char *'.

diff --git a/gettext-tools/libgrep/hard-locale.c b/gettext-tools/libgrep/hard-locale.c
index b0566ec2186ab5b17a7f831b811e5cf8deb6d001..8725f9e7649ea90092aa910eec305d7f1d6c2610 100644 (file)
--- a/gettext-tools/libgrep/hard-locale.c
+++ b/gettext-tools/libgrep/hard-locale.c
@@ -1,7 +1,6 @@
 /* hard-locale.c -- Determine whether a locale is hard.
 
-   Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1997-1999, 2002-2005 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,7 +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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/libgrep/m-common.c b/gettext-tools/libgrep/m-common.c
index 49689dbd7c4f766af42966fe25c09c2a29987bfa..3bf13a6cddb1485475d4e12b52e80d5c303dd6a6 100644 (file)
--- a/gettext-tools/libgrep/m-common.c
+++ b/gettext-tools/libgrep/m-common.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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/libgrep/m-fgrep.c b/gettext-tools/libgrep/m-fgrep.c
index d13e99431a417cd17df6ff8dfb896b88423761eb..28f900c80bdb06ec7ac77b94ce7047a35c46169e 100644 (file)
--- a/gettext-tools/libgrep/m-fgrep.c
+++ b/gettext-tools/libgrep/m-fgrep.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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/libgrep/m-regex.c b/gettext-tools/libgrep/m-regex.c
index 69326d3b7e67948a0fab2dbc894d4cc835d7b0cd..6f7aae376bfb922d3173e6ac60f4b2c4df8372ea 100644 (file)
--- a/gettext-tools/libgrep/m-regex.c
+++ b/gettext-tools/libgrep/m-regex.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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/libuniname/ChangeLog b/gettext-tools/libuniname/ChangeLog
index 79af7af8f88664e5f0eb8c969c636b0b8b7680ab..aced19342b4bbb5c40e8c3505307da6746707fc4 100644 (file)
--- a/gettext-tools/libuniname/ChangeLog
+++ b/gettext-tools/libuniname/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-06  Bruno Haible  <bruno@clisp.org>
+
+       * uniname.c: Test HAVE_CONFIG_H using #ifdef.
+       * test-names.c: Likewise.
+       Reported by Ralf Wildenhues on bug-gnulib.
+
 2005-05-23  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.5 released.

diff --git a/gettext-tools/libuniname/test-names.c b/gettext-tools/libuniname/test-names.c
index 2a32c95df7ba8aa111dd8ae9e75ee5996201b333..640ec1c4e93ad37dc85e7157b7dad2c1a8e9babd 100644 (file)
--- a/gettext-tools/libuniname/test-names.c
+++ b/gettext-tools/libuniname/test-names.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character name functions.
-   Copyright (C) 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2005 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,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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 

diff --git a/gettext-tools/libuniname/uniname.c b/gettext-tools/libuniname/uniname.c
index e05bc438c890fd23746b7dfae9adf122dedaea68..a5b86741ea47e5c4098f2208b3c6e3e45c03f96d 100644 (file)
--- a/gettext-tools/libuniname/uniname.c
+++ b/gettext-tools/libuniname/uniname.c
@@ -1,5 +1,5 @@
 /* Association between Unicode characters and their names.
-   Copyright (C) 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2005 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,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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif