From 050aae2860e1c202e2e9db715beaa97d0a4c9c33 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Wed, 13 Feb 2013 12:22:50 +0100 Subject: [PATCH] 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. --- Zend/zend_ini.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.40.0