[Python-checkins] cpython (2.7): Fix for r84195: add HAVE_ALLOCA_H to configure and only include alloca.h if
christian.heimes
python-checkins at python.org
Tue Jun 18 13:25:38 CEST 2013
http://hg.python.org/cpython/rev/4f4433b12757
changeset: 84204:4f4433b12757
branch: 2.7
parent: 84197:cf615d161f8f
user: Christian Heimes <christian at cheimes.de>
date: Tue Jun 18 13:25:24 2013 +0200
summary:
Fix for r84195: add HAVE_ALLOCA_H to configure and only include alloca.h if it's available
files:
Modules/_ctypes/callproc.c | 3 +++
configure | 2 +-
configure.ac | 2 +-
pyconfig.h.in | 3 +++
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
--- 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
--- a/configure
+++ b/configure
@@ -6654,7 +6654,7 @@
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
--- a/configure.ac
+++ b/configure.ac
@@ -1519,7 +1519,7 @@
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
--- 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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list