From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 19 Jun 2006 09:39:50 +0000 (+0000)
Subject: * alloca_.h (alloca) [defined alloca]: Don't define or declare.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=befdbf38ebf8fe8e1ba8df593aba9382b58ed125;p=pspp

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 90d4ebd432..e9d05c0eb9 100644
--- 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 3e3fdf43f8..dd0b3e98f5 100644
--- 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 */