cvs: ZendEngine2(PHP_5_2) / zend_alloc.c
| From: | Dmitry Stogov | Date: | Mon, 18 Dec 2006 08:59:40 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_2) / zend_alloc.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-5478@lists.php.net to get a copy of this message | ||
dmitry Mon Dec 18 08:59:40 2006 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2 zend_alloc.c
Log:
MFH: __builtin_expect() exists only in GCC 3.0 and higher
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_alloc.c?r1=1.144.2.3.2.24&r2=1.144.2.3.2.25&diff_format=u
Index: ZendEngine2/zend_alloc.c
diff -u ZendEngine2/zend_alloc.c:1.144.2.3.2.24 ZendEngine2/zend_alloc.c:1.144.2.3.2.25
--- ZendEngine2/zend_alloc.c:1.144.2.3.2.24 Fri Dec 15 17:03:42 2006
+++ ZendEngine2/zend_alloc.c Mon Dec 18 08:59:40 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_alloc.c,v 1.144.2.3.2.24 2006/12/15 17:03:42 andi Exp $ */
+/* $Id: zend_alloc.c,v 1.144.2.3.2.25 2006/12/18 08:59:40 dmitry 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));