From: Christian Heimes <christian@cheimes.de>
Date: Tue, 18 Jun 2013 11:25:24 +0000 (+0200)
Subject: Fix for r84195: add HAVE_ALLOCA_H to configure and only include alloca.h if it's... 
X-Git-Tag: v2.7.6rc1~351
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3aa138fe1dd59d8fc790436e2226cea6e03b0490;p=thirdparty%2FPython%2Fcpython.git

Fix for r84195: add HAVE_ALLOCA_H to configure and only include alloca.h if it's available
---

diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index c8ce10554855..6642dc3f4c0e 100644
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -75,7 +75,10 @@
 
 #include <ffi.h>
 #include "ctypes.h"
+#ifdef HAVE_ALLOCA_H
+/* AIX needs alloca.h for alloca() */
 #include <alloca.h>
+#endif
 
 #if defined(_DEBUG) || defined(__MINGW32__)
 /* Don't use structured exception handling on Windows if this is defined.
diff --git a/configure b/configure
index 644e76c13fb8..5f376af77567 100755
--- a/configure
+++ b/configure
@@ -6654,7 +6654,7 @@ sys/param.h sys/poll.h sys/select.h sys/socket.h sys/statvfs.h sys/stat.h \
 sys/termio.h sys/time.h \
 sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
 sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
-bluetooth/bluetooth.h linux/tipc.h spawn.h util.h
+bluetooth/bluetooth.h linux/tipc.h spawn.h util.h alloca.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
diff --git a/configure.ac b/configure.ac
index 4196bc00b25d..b4ed0107a83d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1519,7 +1519,7 @@ sys/param.h sys/poll.h sys/select.h sys/socket.h sys/statvfs.h sys/stat.h \
 sys/termio.h sys/time.h \
 sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
 sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
-bluetooth/bluetooth.h linux/tipc.h spawn.h util.h)
+bluetooth/bluetooth.h linux/tipc.h spawn.h util.h alloca.h)
 AC_HEADER_DIRENT
 AC_HEADER_MAJOR
 
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 231b9c8a31f4..65df68aed9f6 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -55,6 +55,9 @@
 /* Define to 1 if you have the `alarm' function. */
 #undef HAVE_ALARM
 
+/* Define to 1 if you have the <alloca.h> header file. */
+#undef HAVE_ALLOCA_H
+
 /* Define this if your time.h defines altzone. */
 #undef HAVE_ALTZONE