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

diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index c8ce10554855d2371d9d7b9a2f1036190c649d9c..6642dc3f4c0ecc04192ad6e01cb3ee54babd4210 100644 (file)
--- 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 644e76c13fb8893f496f4b06a82186f1519b9f9f..5f376af77567d6e086e5e8d8191a333716f62c72 100755 (executable)
--- 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 4196bc00b25dc7a2f3d949f51b38aac8b7a5b954..b4ed0107a83d59a8800e99b490307f46fe20c096 100644 (file)
--- 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 231b9c8a31f450ace71be98e16b3c0b4825da956..65df68aed9f60ad001f6afd2cc02bc7b6edb226f 100644 (file)
--- 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