summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkrakjoe <joe.watkins@live.co.uk>2013-11-17 22:39:31 +0000
committerkrakjoe <joe.watkins@live.co.uk>2013-11-20 16:24:22 +0000
commit1a1e83a5d9a8c5cd30465ad83e92821e1cbf231c (patch)
tree4bd6bcf8a3003ca69b1eeefa02d45f7c87ec49b3
parent8c05e861d659f912d95f1720e985632757c5057b (diff)
downloadphp-git-1a1e83a5d9a8c5cd30465ad83e92821e1cbf231c.tar.gz
export more Zend API
-rw-r--r--Zend/zend.c4
-rw-r--r--Zend/zend.h14
-rw-r--r--Zend/zend_API.c6
-rw-r--r--Zend/zend_execute.c2
-rw-r--r--Zend/zend_execute.h2
5 files changed, 15 insertions, 13 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index a5ed953cd0..33161f79e3 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -919,7 +919,7 @@ ZEND_API char *get_zend_version(void) /* {{{ */
}
/* }}} */
-void zend_activate(TSRMLS_D) /* {{{ */
+ZEND_API void zend_activate(TSRMLS_D) /* {{{ */
{
#ifdef ZTS
virtual_cwd_activate(TSRMLS_C);
@@ -939,7 +939,7 @@ void zend_call_destructors(TSRMLS_D) /* {{{ */
}
/* }}} */
-void zend_deactivate(TSRMLS_D) /* {{{ */
+ZEND_API void zend_deactivate(TSRMLS_D) /* {{{ */
{
/* we're no longer executing anything */
EG(opline_ptr) = NULL;
diff --git a/Zend/zend.h b/Zend/zend.h
index 5ac884455d..5f2bd47c83 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -651,12 +651,14 @@ ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int
ZEND_API void zend_output_debug_string(zend_bool trigger_break, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
END_EXTERN_C()
-void zend_activate(TSRMLS_D);
-void zend_deactivate(TSRMLS_D);
-void zend_call_destructors(TSRMLS_D);
-void zend_activate_modules(TSRMLS_D);
-void zend_deactivate_modules(TSRMLS_D);
-void zend_post_deactivate_modules(TSRMLS_D);
+BEGIN_EXTERN_C()
+ZEND_API void zend_activate(TSRMLS_D);
+ZEND_API void zend_deactivate(TSRMLS_D);
+ZEND_API void zend_call_destructors(TSRMLS_D);
+ZEND_API void zend_activate_modules(TSRMLS_D);
+ZEND_API void zend_deactivate_modules(TSRMLS_D);
+ZEND_API void zend_post_deactivate_modules(TSRMLS_D);
+END_EXTERN_C()
#if ZEND_DEBUG
#define Z_DBG(expr) (expr)
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 5fa7fb908e..56b1fda24b 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2381,7 +2381,7 @@ void module_destructor(zend_module_entry *module) /* {{{ */
}
/* }}} */
-void zend_activate_modules(TSRMLS_D) /* {{{ */
+ZEND_API void zend_activate_modules(TSRMLS_D) /* {{{ */
{
zend_module_entry **p = module_request_startup_handlers;
@@ -2410,7 +2410,7 @@ int module_registry_cleanup(zend_module_entry *module TSRMLS_DC) /* {{{ */
}
/* }}} */
-void zend_deactivate_modules(TSRMLS_D) /* {{{ */
+ZEND_API void zend_deactivate_modules(TSRMLS_D) /* {{{ */
{
EG(opline_ptr) = NULL; /* we're no longer executing anything */
@@ -2457,7 +2457,7 @@ static int exec_done_cb(zend_module_entry *module TSRMLS_DC) /* {{{ */
}
/* }}} */
-void zend_post_deactivate_modules(TSRMLS_D) /* {{{ */
+ZEND_API void zend_post_deactivate_modules(TSRMLS_D) /* {{{ */
{
if (EG(full_tables_cleanup)) {
zend_hash_apply(&module_registry, (apply_func_t) exec_done_cb TSRMLS_CC);
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 77e67e6cbb..b92572ac53 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1678,7 +1678,7 @@ static zend_always_inline zend_execute_data *i_create_execute_data_from_op_array
}
/* }}} */
-zend_execute_data *zend_create_execute_data_from_op_array(zend_op_array *op_array, zend_bool nested TSRMLS_DC) /* {{{ */
+ZEND_API zend_execute_data *zend_create_execute_data_from_op_array(zend_op_array *op_array, zend_bool nested TSRMLS_DC) /* {{{ */
{
return i_create_execute_data_from_op_array(op_array, nested TSRMLS_CC);
}
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 5c900e5cec..ca619dbf50 100644
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -56,7 +56,7 @@ ZEND_API extern void (*zend_execute_internal)(zend_execute_data *execute_data_pt
void init_executor(TSRMLS_D);
void shutdown_executor(TSRMLS_D);
void shutdown_destructors(TSRMLS_D);
-zend_execute_data *zend_create_execute_data_from_op_array(zend_op_array *op_array, zend_bool nested TSRMLS_DC);
+ZEND_API zend_execute_data *zend_create_execute_data_from_op_array(zend_op_array *op_array, zend_bool nested TSRMLS_DC);
ZEND_API void zend_execute(zend_op_array *op_array TSRMLS_DC);
ZEND_API void execute_ex(zend_execute_data *execute_data TSRMLS_DC);
ZEND_API void execute_internal(zend_execute_data *execute_data_ptr, struct _zend_fcall_info *fci, int return_value_used TSRMLS_DC);