[svn] Update alloca declaration.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8388a998d48a4644ef59dc9950aa5885787cbfaf..5b16ee3bfd0979dd21f7add8286f790925c63f6b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-26  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * config-post.h: Replace the alloca declaration with the one from
+       the latest Autoconf manual.  This should remove a warning with GCC
+       on AIX.
+
 2005-06-26  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * ftp.c (getftp): Always invoke SIZE, not only when continuing a

diff --git a/src/config-post.h b/src/config-post.h
index 04de0b7db20a38fca702a6fb068099b4cf841e7f..ed69cf81349f5585cc0843bccb05045ced1cd38a 100644 (file)
--- a/src/config-post.h
+++ b/src/config-post.h
@@ -6,23 +6,7 @@
 
    This file is included at the bottom of config.h.  */
 
-/* Alloca-related defines, straight out of the Autoconf manual. */
-
-/* AIX requires this to be the first thing in the file.  */
-#ifndef __GNUC__
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
+/* Testing for __sun is not enough because it's also defined on SunOS.  */
 #ifdef __sun
 # ifdef __SVR4
 #  define solaris
@@ -64,3 +48,25 @@ void *alloca ();
 #define _BSD_SOURCE
 
 #endif /* NAMESPACE_TWEAKS */
+
+
+/* Alloca-related defines, straight out of the Autoconf manual.  These
+   have to be after the above namespace tweaks, but before actual
+   declarations and system includes.  */
+
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+#elif defined __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