Skip to content

Commit 65fa9f2

Browse files
author
Ard Biesheuvel
committed
Merge branch 'PHP-5.4' into PHP-5.5
2 parents d1ad926 + 050aae2 commit 65fa9f2

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)