Skip to content

Commit 45c7e3b

Browse files
committed
Fix #12123 Make _ZEND_TYPE_PREFIX apply only for MSVC
Closes GH-12136
1 parent 58657ff commit 45c7e3b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

NEWS

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ PHP NEWS
1515
. Fixed bug GH-12102 (Incorrect compile error when using array access on TMP
1616
value in function call). (ilutov)
1717
. Fixed warning emitted when checking if a user stream is castable. (Girgias)
18+
. Fixed bug GH-12123 (Compile error on MacOS with C++ extension when using
19+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX). (kocsismate)
1820

1921
- FPM:
2022
. Fixed GH-12077 (PHP 8.3.0RC1 borked socket-close-on-exec.phpt).

Zend/zend_types.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ typedef struct {
269269
#define ZEND_TYPE_ALLOW_NULL(t) \
270270
(((t).type_mask & _ZEND_TYPE_NULLABLE_BIT) != 0)
271271

272-
#ifdef __cplusplus
272+
#if defined(__cplusplus) && defined(_MSC_VER)
273273
# define _ZEND_TYPE_PREFIX zend_type
274274
#else
275275
/* FIXME: We could add (zend_type) here at some point but this breaks in MSVC because

0 commit comments

Comments
 (0)