Skip to content

Commit 050aae2

Browse files
author
Ard Biesheuvel
committed
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.
1 parent e67a2b9 commit 050aae2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Zend/zend_ini.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#define ZEND_INI_ALL (ZEND_INI_USER|ZEND_INI_PERDIR|ZEND_INI_SYSTEM)
2929

3030
#ifndef XtOffsetOf
31-
# if defined(CRAY) || (defined(__arm) && !defined(LINUX))
31+
# if defined(CRAY) || (defined(__ARMCC_VERSION) && !defined(LINUX))
3232
# ifdef __STDC__
3333
# define XtOffset(p_type, field) _Offsetof(p_type, field)
3434
# else

0 commit comments

Comments
 (0)