From 81ec479710240c995a1f3b5783663da77275c876 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 24 May 1998 18:03:36 +0000
Subject: 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.
---
 intl/dcgettext.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'intl/dcgettext.c')

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
-- 
cgit v1.2.3