Girgias · Oct 16, 2026 · Oct 16, 2026 · Oct 16, 2026 · Oct 16, 2026 · Oct 16, 2026
diff --git a/Zend/zend_attributes_arginfo.h b/Zend/zend_attributes_arginfo.h
diff --git a/Zend/zend_builtin_functions_arginfo.h b/Zend/zend_builtin_functions_arginfo.h
diff --git a/Zend/zend_closures_arginfo.h b/Zend/zend_closures_arginfo.h
diff --git a/Zend/zend_constants_arginfo.h b/Zend/zend_constants_arginfo.h
diff --git a/Zend/zend_enum_arginfo.h b/Zend/zend_enum_arginfo.h
diff --git a/Zend/zend_exceptions_arginfo.h b/Zend/zend_exceptions_arginfo.h
diff --git a/Zend/zend_fibers_arginfo.h b/Zend/zend_fibers_arginfo.h
diff --git a/Zend/zend_generators_arginfo.h b/Zend/zend_generators_arginfo.h
@@ -84,15 +84,6 @@ typedef enum {
 #define HT_DEC_ITERATORS_COUNT(ht) \
 	HT_SET_ITERATORS_COUNT(ht, HT_ITERATORS_COUNT(ht) - 1)
 
-extern ZEND_API const HashTable zend_empty_array;
-
-#define ZVAL_EMPTY_ARRAY(z) do {						\
-		zval *__z = (z);								\
-		Z_ARR_P(__z) = (zend_array*)&zend_empty_array;	\
-		Z_TYPE_INFO_P(__z) = IS_ARRAY; \
-	} while (0)
-
-
 typedef struct _zend_hash_key {
 	zend_ulong h;
 	zend_string *key;
@@ -101,6 +92,13 @@ typedef struct _zend_hash_key {
 typedef bool (*merge_checker_func_t)(HashTable *target_ht, zval *source_data, zend_hash_key *hash_key, void *pParam);
 
 BEGIN_EXTERN_C()
+extern ZEND_API const HashTable zend_empty_array;
+
+#define ZVAL_EMPTY_ARRAY(z) do {						\
+		zval *__z = (z);								\
+		Z_ARR_P(__z) = (zend_array*)&zend_empty_array;	\
+		Z_TYPE_INFO_P(__z) = IS_ARRAY; \
+	} while (0)
 
 /* startup/shutdown */
 ZEND_API void ZEND_FASTCALL _zend_hash_init(HashTable *ht, uint32_t nSize, dtor_func_t pDestructor, bool persistent);

diff --git a/Zend/zend_interfaces_arginfo.h b/Zend/zend_interfaces_arginfo.h
diff --git a/Zend/zend_weakrefs_arginfo.h b/Zend/zend_weakrefs_arginfo.h
@@ -4785,7 +4785,9 @@ function (FuncInfo $funcInfo) use (&$generatedFunctionDeclarations) {
                 . "\n"
                 . "#ifndef {$headerName}\n"
                 . "#define {$headerName}\n"
+                . "BEGIN_EXTERN_C()\n"
                 . $declCode . "\n"
+                . "END_EXTERN_C()\n"
                 . "#endif /* {$headerName} */\n";
         }
 
@@ -4795,7 +4797,9 @@ function (FuncInfo $funcInfo) use (&$generatedFunctionDeclarations) {
             . " * Stub hash: $stubHash"
             . ($hasDeclFile ? "\n * Has decl header: yes */\n" : " */\n")
             . ($includeCode !== "" ? "\n" . $includeCode : "")
-            . $code;
+            . "BEGIN_EXTERN_C()\n"
+            . $code . "\n"
+            . "END_EXTERN_C()\n";
 
         return [$code, $declCode];
     }

diff --git a/ext/bz2/bz2_arginfo.h b/ext/bz2/bz2_arginfo.h
diff --git a/ext/calendar/calendar_arginfo.h b/ext/calendar/calendar_arginfo.h
diff --git a/ext/com_dotnet/com_extension_arginfo.h b/ext/com_dotnet/com_extension_arginfo.h
diff --git a/ext/com_dotnet/com_persist_arginfo.h b/ext/com_dotnet/com_persist_arginfo.h
diff --git a/ext/ctype/ctype_arginfo.h b/ext/ctype/ctype_arginfo.h
diff --git a/ext/dl_test/dl_test_arginfo.h b/ext/dl_test/dl_test_arginfo.h
diff --git a/ext/enchant/enchant_arginfo.h b/ext/enchant/enchant_arginfo.h