From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 15 Jun 2005 19:05:55 +0000 (+0000)
Subject: Fixed OS X compatibility
X-Git-Tag: php-5.1.0b2~173
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47676bc067e551f87425be1b3f604a31a9860f68;p=php

Fixed OS X compatibility
---

diff --git a/Zend/zend.c b/Zend/zend.c
index 54d8b0c3d8..d48b05e43d 100644
--- 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 548063d0f0..65a91f696d 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 *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