summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--misc/regexp.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 20ab2badb1..f8a241f02d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-09-24  Ulrich Drepper  <drepper@cygnus.com>
+
+	* misc/regexp.h (compile): Use alloca instead of __alloca.  It won't
+	pollute the namespace since the compiler will resolve it inline.
+	Reported by Florian La Roche <florian@suse.de>.
+
 1998-09-24 10:29  Ulrich Drepper  <drepper@cygnus.com>
 
 	* timezone/private.h: Update from tzcode1998g.
diff --git a/misc/regexp.h b/misc/regexp.h
index c2633eb8da..54052b7b0f 100644
--- a/misc/regexp.h
+++ b/misc/regexp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -141,7 +141,7 @@ compile (char *instring, char *expbuf, __const char *endbuf, int eof)
       if (__current_size + 1 >= __input_size)
 	{
 	  size_t __new_size = __input_size ? 2 * __input_size : 128;
-	  char *__new_room = __alloca (__new_size);
+	  char *__new_room = alloca (__new_size);
 	  /* See whether we can use the old buffer.  */
 	  if (__new_room + __new_size == __input_buffer)
 	    {