MFZE1 (Expose more C++ APIs)

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index f0f38dd386b0c405005743e9310703defde9bd8e..f7e0b03d5e3afc89bcf0e65a7d73417a53b005e7 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -29,6 +29,8 @@
 #include "zend_variables.h"
 #include "zend_execute.h"
 
+
+BEGIN_EXTERN_C()
 #define ZEND_FN(name) zif_##name
 #define ZEND_NAMED_FUNCTION(name) void name(INTERNAL_FUNCTION_PARAMETERS)
 #define ZEND_FUNCTION(name) ZEND_NAMED_FUNCTION(ZEND_FN(name))
@@ -426,6 +428,8 @@ ZEND_API int zend_set_hash_symbol(zval *symbol, char *name, int name_length,
 #define ZEND_RSHUTDOWN_FUNCTION                ZEND_MODULE_DEACTIVATE_D
 #define ZEND_MINFO_FUNCTION                    ZEND_MODULE_INFO_D
 
+END_EXTERN_C()
+       
 #endif /* ZEND_API_H */
 
 

diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 888e6eb011e76c67b3d44ed7ea914cb42c145f85..686f1a6640a370a7379fc71736905c3fca8b7085 100644 (file)
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -49,6 +49,7 @@ typedef union _temp_variable {
 } temp_variable;
 
 
+BEGIN_EXTERN_C()
 ZEND_API extern void (*zend_execute)(zend_op_array *op_array TSRMLS_DC);
 
 void init_executor(TSRMLS_D);
@@ -161,4 +162,6 @@ void zend_assign_to_variable_reference(znode *result, zval **variable_ptr_ptr, z
 #define IS_OVERLOADED_OBJECT 1
 #define IS_STRING_OFFSET 2
 
+END_EXTERN_C()
+
 #endif /* ZEND_EXECUTE_H */

diff --git a/Zend/zend_list.h b/Zend/zend_list.h
index 0b1054a263f00e0d5fd1a68b49965a47886d7c4b..448e4576fb5c28b852aa598274fcd80cbebc1bb9 100644 (file)
--- a/Zend/zend_list.h
+++ b/Zend/zend_list.h
@@ -24,6 +24,7 @@
 #include "zend_hash.h"
 #include "zend_globals.h"
 
+BEGIN_EXTERN_C()
 
 #define ZEND_RESOURCE_LIST_TYPE_STD    1
 #define ZEND_RESOURCE_LIST_TYPE_EX     2
@@ -105,5 +106,6 @@ extern ZEND_API int le_index_ptr;  /* list entry type for index pointers */
     if (le_id == 0) {                                  \
         le_id = zend_fetch_list_dtor_id(le_type_name); \
        }
+END_EXTERN_C()
 
 #endif