File tree Expand file tree Collapse file tree 2 files changed +12
-8
lines changed Expand file tree Collapse file tree 2 files changed +12
-8
lines changed Original file line number Diff line number Diff line change @@ -17,6 +17,10 @@ PHP NEWS
17
17
. Fix crash when calling childNodes next() when iterator is exhausted.
18
18
(nielsdos)
19
19
20
+ - Hash:
21
+ . ext/hash: Swap the checking order of `__has_builtin` and `__GNUC__`
22
+ (Saki Takamachi)
23
+
20
24
- Opcache:
21
25
. Fixed bug GH-14109 (Fix accidental persisting of internal class constant in
22
26
shm). (ilutov)
Original file line number Diff line number Diff line change @@ -13,14 +13,7 @@ FORCE_INLINE int IsBigEndian(void)
13
13
# define BSWAP32 (u ) _byteswap_ulong(u)
14
14
# define BSWAP64 (u ) _byteswap_uint64(u)
15
15
#else
16
- # ifdef __has_builtin
17
- # if __has_builtin (__builtin_bswap32 )
18
- # define BSWAP32 (u ) __builtin_bswap32(u)
19
- # endif // __has_builtin(__builtin_bswap32)
20
- # if __has_builtin (__builtin_bswap64 )
21
- # define BSWAP64 (u ) __builtin_bswap64(u)
22
- # endif // __has_builtin(__builtin_bswap64)
23
- # elif defined(__GNUC__ ) && ( \
16
+ # if defined(__GNUC__ ) && ( \
24
17
__GNUC__ > 4 || ( \
25
18
__GNUC__ == 4 && ( \
26
19
__GNUC_MINOR__ >= 3 \
@@ -29,6 +22,13 @@ FORCE_INLINE int IsBigEndian(void)
29
22
)
30
23
# define BSWAP32 (u ) __builtin_bswap32(u)
31
24
# define BSWAP64 (u ) __builtin_bswap64(u)
25
+ # elif defined(__has_builtin )
26
+ # if __has_builtin (__builtin_bswap32 )
27
+ # define BSWAP32 (u ) __builtin_bswap32(u)
28
+ # endif // __has_builtin(__builtin_bswap32)
29
+ # if __has_builtin (__builtin_bswap64 )
30
+ # define BSWAP64 (u ) __builtin_bswap64(u)
31
+ # endif // __has_builtin(__builtin_bswap64)
32
32
# endif // __has_builtin
33
33
#endif // defined(_MSC_VER)
34
34
You can’t perform that action at this time.
0 commit comments