diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2013-02-13 12:22:50 +0100 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2013-02-13 12:22:50 +0100 |
| commit | 050aae2860e1c202e2e9db715beaa97d0a4c9c33 (patch) | |
| tree | 942749506b0a06e2bca29f2a4426ac9349964219 | |
| parent | e67a2b9e471a7bc0b774b9056bb38745b7187969 (diff) | |
| download | php-git-050aae2860e1c202e2e9db715beaa97d0a4c9c33.tar.gz | |
Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang)
Updated the code to test for __ARMCC_VERSION instead of __arm, as
that is a more reliable indicator of whether the ARMCC compiler is
being used.
| -rw-r--r-- | Zend/zend_ini.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_ini.h b/Zend/zend_ini.h index 2773ebb6c0..b27d3d4add 100644 --- a/Zend/zend_ini.h +++ b/Zend/zend_ini.h @@ -28,7 +28,7 @@ #define ZEND_INI_ALL (ZEND_INI_USER|ZEND_INI_PERDIR|ZEND_INI_SYSTEM) #ifndef XtOffsetOf -# if defined(CRAY) || (defined(__arm) && !defined(LINUX)) +# if defined(CRAY) || (defined(__ARMCC_VERSION) && !defined(LINUX)) # ifdef __STDC__ # define XtOffset(p_type, field) _Offsetof(p_type, field) # else |