Mercurial > hg > octave-lyh > gnulib-hg

changeset 6837:02c971653322

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* alloca_.h (alloca) [defined alloca]: Don't define or declare.
author Paul Eggert <eggert@cs.ucla.edu>
date Mon, 19 Jun 2006 09:39:50 +0000
parents e2c19cb657e7
children 5eb20b30a115
files lib/ChangeLog lib/alloca_.h
diffstat 2 files changed, 18 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- 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>.
--- 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
+void *alloca (size_t);
 # endif
-void *alloca (size_t);
 #endif
 
 #endif /* _GNULIB_ALLOCA_H */