cvs: ZendEngine2(PHP_5_3) / zend.h

rasmus Wed Jun 17 08:55:23 2009 UTC Modified files: (Branch: PHP_5_3) /ZendEngine2 zend.h Log: Need the gcc version check here too http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.h?r1=1.293.2.11.2.9.2.36&r2=1.293.2.11.2.9.2.37&diff_format=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.293.2.11.2.9.2.36 ZendEngine2/zend.h:1.293.2.11.2.9.2.37 --- ZendEngine2/zend.h:1.293.2.11.2.9.2.36 Fri Jun 5 22:14:21 2009 +++ ZendEngine2/zend.h Wed Jun 17 08:55:23 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.h,v 1.293.2.11.2.9.2.36 2009/06/05 22:14:21 rasmus Exp $ */ +/* $Id: zend.h,v 1.293.2.11.2.9.2.37 2009/06/17 08:55:23 rasmus Exp $ */ #ifndef ZEND_H #define ZEND_H @@ -292,7 +292,7 @@ #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) && !defined(_AIX) && !defined(__osf__) +#if defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__) void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((noreturn)); #else # define zend_error_noreturn zend_error