cvs: ZendEngine2 / zend_alloc.c

andrei Fri Dec 15 22:47:09 2006 UTC Modified files: /ZendEngine2 zend_alloc.c Log: __builtin_expect() exists only in GCC 3.0 and higher. http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_alloc.c?r1=1.175&r2=1.176&diff_format=u Index: ZendEngine2/zend_alloc.c diff -u ZendEngine2/zend_alloc.c:1.175 ZendEngine2/zend_alloc.c:1.176 --- ZendEngine2/zend_alloc.c:1.175 Fri Dec 15 17:17:57 2006 +++ ZendEngine2/zend_alloc.c Fri Dec 15 22:47:09 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_alloc.c,v 1.175 2006/12/15 17:17:57 andi Exp $ */ +/* $Id: zend_alloc.c,v 1.176 2006/12/15 22:47:09 andrei Exp $ */ #include "zend.h" #include "zend_alloc.h" @@ -66,7 +66,7 @@ } #endif -#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) +#if (defined (__GNUC__) && __GNUC__ > 2 ) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) # define EXPECTED(condition) __builtin_expect(condition, 1) # define UNEXPECTED(condition) __builtin_expect(condition, 0) static void zend_mm_panic(const char *message) __attribute__ ((noreturn));