diff options
author | Antony Dovgal <tony2001@php.net> | 2006-03-30 21:39:01 +0000 |
---|---|---|
committer | Antony Dovgal <tony2001@php.net> | 2006-03-30 21:39:01 +0000 |
commit | 0fab5aacce2a44dcfefa5d9e47e5031ece3a7fcb (patch) | |
tree | 940288a287aeea89e49618353bd9bcb477d6d499 | |
parent | 7fbb54f55cd1f8b8fc3f5ed704f15997c61e319d (diff) | |
download | php-git-0fab5aacce2a44dcfefa5d9e47e5031ece3a7fcb.tar.gz |
fix compilation on AIX
-rw-r--r-- | Zend/zend.c | 2 | ||||
-rw-r--r-- | Zend/zend.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 366cd21c78..c6a9ec703c 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1054,7 +1054,7 @@ ZEND_API void zend_error(int type, const char *format, ...) } } -#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) +#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((alias("zend_error"),noreturn)); #endif diff --git a/Zend/zend.h b/Zend/zend.h index 0a5a00491f..45a9e75742 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -250,7 +250,7 @@ char *alloca (); #define INTERNAL_FUNCTION_PARAMETERS int ht, zval *return_value, zval **return_value_ptr, zval *this_ptr, int return_value_used TSRMLS_DC #define INTERNAL_FUNCTION_PARAM_PASSTHRU ht, return_value, return_value_ptr, this_ptr, return_value_used TSRMLS_CC -#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) +#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) # define ZEND_VM_ALWAYS_INLINE __attribute__ ((always_inline)) void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((noreturn)); #else |