Update.

1998-05-23  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>

	* nis/nis_defaults.c: Fix buffer problems and typos.

1998-05-23 08:42  Ulrich Drepper  <drepper@cygnus.com>

	* intl/dcgettext.c: Don't use any alloca hacks if C_ALLOCA is defined.
	Patch by Fred Fish.

diff --git a/ChangeLog b/ChangeLog
index 89358e7..0837510 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1998-05-23  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>
+
+       * nis/nis_defaults.c: Fix buffer problems and typos.
+
+1998-05-23 08:42  Ulrich Drepper  <drepper@cygnus.com>
+
+       * intl/dcgettext.c: Don't use any alloca hacks if C_ALLOCA is defined.
+       Patch by Fred Fish.
+
 1998-05-22  Ulrich Drepper  <drepper@cygnus.com>
 
        * stdlib/random_r.c (__random_r): Rewrite last patch to fix buffer

diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index 777dd31..2369285 100644 (file)
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -25,11 +25,11 @@
 
 #include <sys/types.h>
 
-#ifdef __GNUC__
+#if defined __GNUC__ && !defined C_ALLOCA
 # define alloca __builtin_alloca
 # define HAVE_ALLOCA 1
 #else
-# if defined HAVE_ALLOCA_H || defined _LIBC
+# if (defined HAVE_ALLOCA_H || defined _LIBC && !defined C_ALLOCA
 #  include <alloca.h>
 # else
 #  ifdef _AIX