diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2013-05-07 20:37:04 +0200 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2013-05-07 20:37:04 +0200 |
| commit | 5b121eb04d358f83e974b6c5fe069c38cf1f960b (patch) | |
| tree | 28641236cd5d6afb814000a4de18c5bb33bf3e52 /Zend/zend_operators.h | |
| parent | de7415ea559444fe0a0cb4d4b4b7b93c8e19435a (diff) | |
| download | php-git-5b121eb04d358f83e974b6c5fe069c38cf1f960b.tar.gz | |
Fix #64780 (PHP 5.5 builds are broken with GCC 3)
A recent change (by me) introduced a call to __builtin_offsetof()
into zend_operators.h which is not defined by GCC prior to
version 4.
Changed the code to use offsetof() instead: this is defined in
<stddef.h>, so #include this header conditionally (#ifdef GNUC)
Diffstat (limited to 'Zend/zend_operators.h')
| -rw-r--r-- | Zend/zend_operators.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index a82c14b8c2..0b890ff48c 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -26,6 +26,10 @@ #include <math.h> #include <assert.h> +#ifdef __GNUC__ +#include <stddef.h> +#endif + #ifdef HAVE_IEEEFP_H #include <ieeefp.h> #endif @@ -497,7 +501,7 @@ ZEND_API void zend_update_current_locale(void); /* The offset in bytes between the value and type fields of a zval */ #define ZVAL_OFFSETOF_TYPE \ - (__builtin_offsetof(zval,type) - __builtin_offsetof(zval,value)) + (offsetof(zval,type) - offsetof(zval,value)) static zend_always_inline int fast_increment_function(zval *op1) { |