From: Antony Dovgal <tony2001@php.net>
Date: Thu, 30 Mar 2006 21:39:15 +0000 (+0000)
Subject: MF51: fix compilation on AIX
X-Git-Tag: RELEASE_1_3~186
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eea22a0ffaab19d8f771f1e82f0832833aa9d5ba;p=php

MF51: fix compilation on AIX
---

diff --git a/Zend/zend.c b/Zend/zend.c
index 41662a39a9..c4382c47e3 100644
--- 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 9c3aaa2ef4..6046f614a2 100644
--- 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