Fix php#12123 Make _ZEND_TYPE_PREFIX apply only for MSVC

Closes phpGH-12136
Girgias · Sep 10, 2023 · 45c7e3b · 45c7e3b
1 parent 58657ff
commit 45c7e3b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -15,6 +15,8 @@ PHP                                                                        NEWS
   . Fixed bug GH-12102 (Incorrect compile error when using array access on TMP
     value in function call). (ilutov)
   . Fixed warning emitted when checking if a user stream is castable. (Girgias)
+  . Fixed bug GH-12123 (Compile error on MacOS with C++ extension when using
+    ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX). (kocsismate)
 
 - FPM:
   . Fixed GH-12077 (PHP 8.3.0RC1 borked socket-close-on-exec.phpt).

diff --git a/Zend/zend_types.h b/Zend/zend_types.h
@@ -269,7 +269,7 @@ typedef struct {
 #define ZEND_TYPE_ALLOW_NULL(t) \
 	(((t).type_mask & _ZEND_TYPE_NULLABLE_BIT) != 0)
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && defined(_MSC_VER)
 # define _ZEND_TYPE_PREFIX zend_type
 #else
 /* FIXME: We could add (zend_type) here at some point but this breaks in MSVC because