Commit: 050aae2860e1c202e2e9db715beaa97d0a4c9c33 Author: Ard Biesheuvel <ard.biesheu...@linaro.org> Wed, 13 Feb 2013 12:22:50 +0100 Parents: e67a2b9e471a7bc0b774b9056bb38745b7187969 Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=050aae2860e1c202e2e9db715beaa97d0a4c9c33 Log: 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. Bugs: https://bugs.php.net/64197 Changed paths: M Zend/zend_ini.h Diff: diff --git a/Zend/zend_ini.h b/Zend/zend_ini.h index 2773ebb..b27d3d4 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 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
