diff options
| author | Christian Heimes <christian@cheimes.de> | 2013-06-18 11:22:37 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2013-06-18 11:22:37 (GMT) |
| commit | 360b89ca5e388298a9910b917b1add21a05b9a1b (patch) | |
| tree | 6689f16deaa3f6bb9ac8c604dd6080603fb48042 | |
| parent | 8dd823340fb993b3efffda5c4896d2a0829e6fe2 (diff) | |
| parent | f0400baba81579483b9763e95babd8a5e92e1ef1 (diff) | |
| download | cpython-360b89ca5e388298a9910b917b1add21a05b9a1b.zip cpython-360b89ca5e388298a9910b917b1add21a05b9a1b.tar.gz cpython-360b89ca5e388298a9910b917b1add21a05b9a1b.tar.bz2 | |
Fix for r84195: add HAVE_ALLOCA_H to configure and only include alloca.h if it's available
| -rw-r--r-- | Modules/_ctypes/callproc.c | 3 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | pyconfig.h.in | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index b993207..7019611 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -70,7 +70,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. @@ -6937,7 +6937,7 @@ sys/param.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ sys/stat.h sys/syscall.h sys/sys_domain.h sys/termio.h sys/time.h \ sys/times.h sys/types.h sys/uio.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 37e0488..030b923 100644 --- a/configure.ac +++ b/configure.ac @@ -1532,7 +1532,7 @@ sys/param.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ sys/stat.h sys/syscall.h sys/sys_domain.h sys/termio.h sys/time.h \ sys/times.h sys/types.h sys/uio.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) CPPFLAGS=$ac_save_cppflags AC_HEADER_DIRENT AC_HEADER_MAJOR diff --git a/pyconfig.h.in b/pyconfig.h.in index 2d4536d..160ec79 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -49,6 +49,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 |