MF51: fix compilation on AIX

diff --git a/Zend/zend.c b/Zend/zend.c
index 41662a39a99ddea7e50a252b0af187adffa9a9cc..c4382c47e3848e813fdfa5b643dbc3a0387e6042 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1503,7 +1503,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 9c3aaa2ef4097d981bbb0c132854489cd20a5e55..6046f614a25b780fa30c2cb009c92989d994d97f 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -280,7 +280,7 @@ static inline zstr _to_zstr(void *v) {
 #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