Skip to content

Commit 5bac4a6

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fix __SANITIZE_ADDRESS__ redeclaration warning
2 parents bab75e1 + d670e13 commit 5bac4a6

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
@@ -135,7 +135,7 @@
135135

136136
#if defined(HAVE_LIBDL) && !defined(ZEND_WIN32)
137137

138-
# if __has_feature(address_sanitizer)
138+
# if __has_feature(address_sanitizer) && !defined(__SANITIZE_ADDRESS__)
139139
# define __SANITIZE_ADDRESS__
140140
# endif
141141

0 commit comments

Comments
 (0)