diff options
| author | Xinchen Hui <laruence@php.net> | 2013-03-11 15:16:47 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-03-11 15:16:47 +0800 |
| commit | 4573405c5dd6686bbe443497dfad84de13ac5cc7 (patch) | |
| tree | afa24afbabe6b1b082255a1d01c6dbd4edf5cdb1 /Zend | |
| parent | c7ad92fac72a11efcfa9b70cb19d9feae87936d6 (diff) | |
| parent | 0444708c5cd665179a936b86369f84b9dad8effe (diff) | |
| download | php-git-4573405c5dd6686bbe443497dfad84de13ac5cc7.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index aed03d8715..e30c26b524 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -365,6 +365,10 @@ struct _zval_struct { #define Z_UNSET_ISREF(z) Z_UNSET_ISREF_P(&(z)) #define Z_SET_ISREF_TO(z, isref) Z_SET_ISREF_TO_P(&(z), isref) +#if ZEND_DEBUG +#define zend_always_inline inline +#define zend_never_inline +#else #if defined(__GNUC__) #if __GNUC__ >= 3 #define zend_always_inline inline __attribute__((always_inline)) @@ -373,7 +377,6 @@ struct _zval_struct { #define zend_always_inline inline #define zend_never_inline #endif - #elif defined(_MSC_VER) #define zend_always_inline __forceinline #define zend_never_inline @@ -381,6 +384,7 @@ struct _zval_struct { #define zend_always_inline inline #define zend_never_inline #endif +#endif /* ZEND_DEBUG */ #if (defined (__GNUC__) && __GNUC__ > 2 ) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) # define EXPECTED(condition) __builtin_expect(condition, 1) |