Fixed OS X compatibility

diff --git a/Zend/zend.c b/Zend/zend.c
index 54d8b0c3d83680ff5ba947acf946b8e19806d7c4..d48b05e43dffa2d9ecda22d17ef27fd1d59d8af6 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1025,7 +1025,7 @@ ZEND_API void zend_error(int type, const char *format, ...)
        }
 }
 
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN)
 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 548063d0f027da0ddc7247fec48c9ac0619895df..65a91f696d24468e17c04c63eada24d71c4fa059 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -250,7 +250,7 @@ char *alloca ();
 #define INTERNAL_FUNCTION_PARAMETERS int ht, zval *return_value, zval *this_ptr, int return_value_used TSRMLS_DC
 #define INTERNAL_FUNCTION_PARAM_PASSTHRU ht, return_value, this_ptr, return_value_used TSRMLS_CC
 
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN)
 #  define ZEND_VM_ALWAYS_INLINE  __attribute__ ((always_inline))
 void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((noreturn));
 #else