Macro definitions are moved to zend.h

diff --git a/Zend/zend.h b/Zend/zend.h
index 4daf17c7c05af133d74bad0ce03cd0cb8cb4645a..6147c3101345b4c6a406c26213dd77805fe08c29 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -367,6 +367,14 @@ struct _zval_struct {
 #define zend_always_inline inline
 #endif
 
+#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)
+#else
+# define EXPECTED(condition)   (condition)
+# define UNEXPECTED(condition) (condition)
+#endif
+
 static zend_always_inline zend_uint zval_refcount_p(zval* pz) {
        return pz->refcount__gc;
 }

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 7ae0a9f6cb893726d0c5c063c3371762a15f2100..492fae29e0512255c56605c7d93223152d1fa6ed 100644 (file)
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -80,12 +80,7 @@ void zend_debug_alloc_output(char *format, ...) /* {{{ */
 #endif
 
 #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));
-#else
-# define EXPECTED(condition)   (condition)
-# define UNEXPECTED(condition) (condition)
 #endif
 
 static void zend_mm_panic(const char *message) /* {{{ */