From: Bruno Haible Date: Tue, 11 Jan 2005 12:58:47 +0000 (+0000) Subject: Partial update from gnulib. X-Git-Tag: v0.14.2~192 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31e7bbb0d1821150143706230fe37f84357eccf5;p=thirdparty%2Fgettext.git Partial update from gnulib. --- diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog index 2512dbaef..7d39b6985 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,7 @@ +2004-12-19 Paul Eggert + + * alloca_.h: Conditionalize on _GNULIB_ALLOCA_H, not _ALLOCA_H. + 2004-05-14 Bruno Haible * 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 b834871b4..aa119d618 100644 --- 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 b210e16c2..997ac31b2 100644 --- a/gettext-tools/lib/ChangeLog +++ b/gettext-tools/lib/ChangeLog @@ -1,3 +1,7 @@ +2004-12-19 Paul Eggert + + * alloca_.h: Conditionalize on _GNULIB_ALLOCA_H, not _ALLOCA_H. + 2004-12-10 Bruno Haible * obstack.h: Update from current gnulib version. diff --git a/gettext-tools/lib/alloca_.h b/gettext-tools/lib/alloca_.h index 86aa0a558..b5841b54c 100644 --- 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 */