[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100208: Backport fix for Bug#6170 from trunk.

[Chong Yidong]

------------------------------------------------------------
revno: 100208
author: Dan Nicolaescu <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-11-13 12:22:52 -0500
message:
  Backport fix for Bug#6170 from trunk.
  Fix alloca definition when using gcc on non-gnu systems.
  * configure.in: Use the code sequence indicated by "info autoconf"
  for alloca (bug#6170).
modified:
  ChangeLog
  configure.in
  src/config.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-11-08 21:07:41 +0000
+++ b/ChangeLog 2010-11-13 17:22:52 +0000
@@ -1,3 +1,9 @@
+2010-11-13  Dan Nicolaescu  <address@hidden>
+
+       Fix alloca definition when using gcc on non-gnu systems.
+       * configure.in: Use the code sequence indicated by "info autoconf"
+       for alloca (bug#6170).
+
 2010-11-08  Stefan Monnier  <address@hidden>
 
        * .dir-locals.el (log-edit-mode): Set log-edit-rewrite-fixes.

=== modified file 'configure.in'
--- a/configure.in      2010-11-09 02:53:18 +0000
+++ b/configure.in      2010-11-13 17:22:52 +0000
@@ -2927,15 +2927,19 @@
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
-#ifndef __GNUC__
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-# else /* AIX files deal with #pragma.  */
-#  ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#  endif
-# endif /* HAVE_ALLOCA_H */
-#endif /* __GNUC__ */
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#elif defined __GNUC__
+# define alloca __builtin_alloca
+#elif defined _AIX
+# define alloca __alloca
+#else
+# include <stddef.h>
+# ifdef  __cplusplus
+extern "C"
+# endif
+void *alloca (size_t);
+#endif
 #ifndef HAVE_SIZE_T
 typedef unsigned size_t;
 #endif

=== modified file 'src/config.in'
--- a/src/config.in     2010-06-09 14:31:12 +0000
+++ b/src/config.in     2010-11-13 17:22:52 +0000
@@ -1178,15 +1178,19 @@
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
-#ifndef __GNUC__
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-# else /* AIX files deal with #pragma.  */
-#  ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#  endif
-# endif /* HAVE_ALLOCA_H */
-#endif /* __GNUC__ */
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#elif defined __GNUC__
+# define alloca __builtin_alloca
+#elif defined _AIX
+# define alloca __alloca
+#else
+# include <stddef.h>
+# ifdef  __cplusplus
+extern "C"
+# endif
+void *alloca (size_t);
+#endif
 #ifndef HAVE_SIZE_T
 typedef unsigned size_t;
 #endif