com php-src: export more Zend API: Zend/zend.c Zend/zend.h Zend/zend_API.c Zend/zend_execute.c Zend/zend_exe cute.h

Commit: 1a1e83a5d9a8c5cd30465ad83e92821e1cbf231c Author: krakjoe <joe.watkins@live.co.uk> Sun, 17 Nov 2013 22:39:31 +0000 Parents: 8c05e861d659f912d95f1720e985632757c5057b Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a1e83a5d9a8c5cd30465ad83e92821e1cbf231c Log: export more Zend API Changed paths: M Zend/zend.c M Zend/zend.h M Zend/zend_API.c M Zend/zend_execute.c M Zend/zend_execute.h Diff: diff --git a/Zend/zend.c b/Zend/zend.c index a5ed953..33161f7 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 5ac8844..5f2bd47 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 5fa7fb9..56b1fda 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 77e67e6..b92572a 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 5c900e5..ca619db 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);