Partial update from gnulib.

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 2512dbaef6189957cd3293e2e89a156f2320bfc4..7d39b6985c862500194817d9e633c3672c541bfe 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * alloca_.h: Conditionalize on _GNULIB_ALLOCA_H, not _ALLOCA_H.
+
 2004-05-14  Bruno Haible  <bruno@clisp.org>
 
        * vasnprintf.c (VASNPRINTF): Correctly handle the case of a precision

diff --git a/gettext-runtime/libasprintf/alloca_.h b/gettext-runtime/libasprintf/alloca_.h
index b834871b497d4841c27e8dd0c2f8ed2ff2e3393f..aa119d618760517eedbec8a79c197f3cd09718a7 100644 (file)
--- a/gettext-runtime/libasprintf/alloca_.h
+++ b/gettext-runtime/libasprintf/alloca_.h
@@ -1,5 +1,5 @@
 /* Memory allocation on the stack.
-   Copyright (C) 1995, 1999, 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995, 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 Library General Public License as published
@@ -20,8 +20,10 @@
    declarations.  Thanks to AIX.  Therefore we include it right after
    "config.h", not later.  */
 
-#ifndef _ALLOCA_H
-#define _ALLOCA_H
+/* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H
+   means there is a real alloca function.  */
+#ifndef _GNULIB_ALLOCA_H
+#define _GNULIB_ALLOCA_H
 
 /* alloca(N) returns a pointer (void* or char*) to N bytes of memory
    allocated on the stack, and which will last until the function returns.
@@ -65,4 +67,4 @@ extern char *alloca ();
 # endif
 #endif
 
-#endif /* _ALLOCA_H */
+#endif /* _GNULIB_ALLOCA_H */

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index b210e16c22ead8db56dd835833d9b7d0c53d966e..997ac31b21aa74d824da90488d939695b09f828d 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * alloca_.h: Conditionalize on _GNULIB_ALLOCA_H, not _ALLOCA_H.
+
 2004-12-10  Bruno Haible  <bruno@clisp.org>
 
        * obstack.h: Update from current gnulib version.

diff --git a/gettext-tools/lib/alloca_.h b/gettext-tools/lib/alloca_.h
index 86aa0a558821af0987127b80854f79ef20d7e212..b5841b54cb1b0ecc8fd9a7dd09788fb5f69bcf59 100644 (file)
--- a/gettext-tools/lib/alloca_.h
+++ b/gettext-tools/lib/alloca_.h
@@ -1,5 +1,5 @@
 /* Memory allocation on the stack.
-   Copyright (C) 1995, 1999, 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995, 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
@@ -20,8 +20,10 @@
    declarations.  Thanks to AIX.  Therefore we include it right after
    "config.h", not later.  */
 
-#ifndef _ALLOCA_H
-#define _ALLOCA_H
+/* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H
+   means there is a real alloca function.  */
+#ifndef _GNULIB_ALLOCA_H
+#define _GNULIB_ALLOCA_H
 
 /* alloca(N) returns a pointer (void* or char*) to N bytes of memory
    allocated on the stack, and which will last until the function returns.
@@ -65,4 +67,4 @@ extern char *alloca ();
 # endif
 #endif
 
-#endif /* _ALLOCA_H */
+#endif /* _GNULIB_ALLOCA_H */