cvs: ZendEngine2 / zend.c zend.h

dmitry Wed Jun 15 15:05:57 2005 EDT Modified files: /ZendEngine2 zend.c zend.h Log: Fixed OS X compatibility http://cvs.php.net/diff.php/ZendEngine2/zend.c?r1=1.304&r2=1.305&ty=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.304 ZendEngine2/zend.c:1.305 --- ZendEngine2/zend.c:1.304 Mon Jun 13 07:22:58 2005 +++ ZendEngine2/zend.c Wed Jun 15 15:05:55 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.304 2005/06/13 11:22:58 dmitry Exp $ */ +/* $Id: zend.c,v 1.305 2005/06/15 19:05:55 dmitry Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -1025,7 +1025,7 @@ } } -#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 http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.279&r2=1.280&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.279 ZendEngine2/zend.h:1.280 --- ZendEngine2/zend.h:1.279 Mon Jun 13 07:22:59 2005 +++ ZendEngine2/zend.h Wed Jun 15 15:05:55 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.h,v 1.279 2005/06/13 11:22:59 dmitry Exp $ */ +/* $Id: zend.h,v 1.280 2005/06/15 19:05:55 dmitry Exp $ */ #ifndef ZEND_H #define ZEND_H @@ -250,7 +250,7 @@ #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