From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Wed, 13 Feb 2013 11:22:50 +0000 (+0100)
Subject: Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang)
X-Git-Tag: php-5.5.0alpha5~14^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=050aae2860e1c202e2e9db715beaa97d0a4c9c33;p=php

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.
---

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