about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-05-24 18:03:36 +0000
committerUlrich Drepper <drepper@redhat.com>1998-05-24 18:03:36 +0000
commit81ec479710240c995a1f3b5783663da77275c876 (patch)
tree4511ab68bc4df1611d17c64c45e9559b3a339615
parent6958e78dd1c61b94d028453a87ead51e9bd32d06 (diff)
downloadglibc-81ec479710240c995a1f3b5783663da77275c876.tar.gz
glibc-81ec479710240c995a1f3b5783663da77275c876.tar.xz
glibc-81ec479710240c995a1f3b5783663da77275c876.zip
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.
-rw-r--r--ChangeLog9
-rw-r--r--intl/dcgettext.c4
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 89358e7e21..083751080f 100644
--- 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 777dd31d04..23692857a5 100644
--- 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