Skip to content

Commit 529a71f

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Fix __SANITIZE_ADDRESS__ redeclaration warning
2 parents 32936c5 + 5bac4a6 commit 529a71f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Zend/zend_portability.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141

142142
#if defined(HAVE_LIBDL) && !defined(ZEND_WIN32)
143143

144-
# if __has_feature(address_sanitizer)
144+
# if __has_feature(address_sanitizer) && !defined(__SANITIZE_ADDRESS__)
145145
# define __SANITIZE_ADDRESS__
146146
# endif
147147

0 commit comments

Comments
 (0)