diff options
| author | Sebastian Bergmann <sebastian@php.net> | 2001-12-11 09:17:38 +0000 |
|---|---|---|
| committer | Sebastian Bergmann <sebastian@php.net> | 2001-12-11 09:17:38 +0000 |
| commit | 4345f8a0b5234efbedf4e49230e957f6020c2b25 (patch) | |
| tree | 68ef072dc40e393041106453f9d111b345d35a26 | |
| parent | 180cce6f635a11c35d60faa71db1ed6fbead1d81 (diff) | |
| download | php-git-4345f8a0b5234efbedf4e49230e957f6020c2b25.tar.gz | |
MFZE1 (AIX fixes)
| -rw-r--r-- | Zend/Zend.m4 | 7 | ||||
| -rw-r--r-- | Zend/zend.h | 16 |
2 files changed, 20 insertions, 3 deletions
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index df6fb5f446..409c040833 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -1,3 +1,8 @@ +dnl +dnl $Id$ +dnl +dnl This file contains Zend specific autoconf functions. +dnl AC_DEFUN(LIBZEND_BISON_CHECK,[ @@ -5,7 +10,7 @@ if test "$YACC" != "bison -y"; then AC_MSG_WARN(You will need bison if you want to regenerate the Zend parser.) else AC_MSG_CHECKING(bison version) - set `bison --version| sed -e 's/^GNU Bison version //' -e 's/\./ /'` + set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /'` if test "${1}" = "1" -a "${2}" -lt "28"; then AC_MSG_WARN(You will need bison 1.28 if you want to regenerate the Zend parser (found ${1}.${2}).) fi diff --git a/Zend/zend.h b/Zend/zend.h index cb935c0a43..545a20da6b 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -17,6 +17,7 @@ +----------------------------------------------------------------------+ */ +/* $Id$ */ #ifndef ZEND_H #define ZEND_H @@ -92,8 +93,19 @@ # define ZEND_EXTENSIONS_SUPPORT 0 #endif -#if HAVE_ALLOCA_H -# include <alloca.h> +/* AIX requires this to be the first thing in the file. */ +#ifndef __GNUC__ +# if HAVE_ALLOCA_H +# include <alloca.h> +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +# endif #endif #if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) |