* alloca_.h (alloca) [defined alloca]: Don't define or declare.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 90d4ebd432dd238f199f0368370fa57bf27a528d..e9d05c0eb9b87d4eebd7a507cf8df91cb3709579 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * alloca_.h (alloca) [defined alloca]: Don't define or declare.
+
 2006-06-17  Bruno Haible  <bruno@clisp.org>
 
        * stdint_.h [FreeBSD >= 5]: Don't include <sys/inttypes.h>.

diff --git a/lib/alloca_.h b/lib/alloca_.h
index 3e3fdf43f860865a3b3c09b0be9006a802d882b1..dd0b3e98f5465978e7822b6e920e1a3be5279b88 100644 (file)
--- a/lib/alloca_.h
+++ b/lib/alloca_.h
@@ -1,6 +1,6 @@
 /* Memory allocation on the stack.
 
-   Copyright (C) 1995, 1999, 2001, 2002, 2003, 2004 Free Software
+   Copyright (C) 1995, 1999, 2001, 2002, 2003, 2004, 2006 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
@@ -34,19 +34,21 @@
        request, the program just crashes.
  */
 
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
+#ifndef alloca
+# ifdef __GNUC__
+#  define alloca __builtin_alloca
+# elif defined _AIX
+#  define alloca __alloca
+# elif defined _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  include <stddef.h>
+#  ifdef  __cplusplus
 extern "C"
-# endif
+#  endif
 void *alloca (size_t);
+# endif
 #endif
 
 #endif /* _GNULIB_ALLOCA_H */