cvs: ZendEngine2(PHP_5_2) / zend.h

rasmus		Wed Jun 17 08:57:04 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /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.15&r2=1.293.2.11.2.16&diff_format=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.293.2.11.2.15 ZendEngine2/zend.h:1.293.2.11.2.16
--- ZendEngine2/zend.h:1.293.2.11.2.15	Fri Jun  5 22:24:53 2009
+++ ZendEngine2/zend.h	Wed Jun 17 08:57:04 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend.h,v 1.293.2.11.2.15 2009/06/05 22:24:53 rasmus Exp $ */
+/* $Id: zend.h,v 1.293.2.11.2.16 2009/06/17 08:57:04 rasmus Exp $ */
 
 #ifndef ZEND_H
 #define ZEND_H
@@ -280,7 +280,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__) && __GNUC__ >= 3
+#if defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__) && __GNUC__ >= 3
 #  define ZEND_VM_ALWAYS_INLINE  __attribute__ ((always_inline))
 void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((noreturn));
 #else