diff options
| -rw-r--r-- | Zend/zend_arg_defs.c | 27 | ||||
| -rw-r--r-- | Zend/zend_builtin_functions.c | 33 | ||||
| -rw-r--r-- | Zend/zend_modules.h | 10 |
3 files changed, 34 insertions, 36 deletions
diff --git a/Zend/zend_arg_defs.c b/Zend/zend_arg_defs.c new file mode 100644 index 0000000000..8570d38087 --- /dev/null +++ b/Zend/zend_arg_defs.c @@ -0,0 +1,27 @@ +ZEND_BEGIN_ARG_INFO(first_arg_force_ref, 0) + ZEND_ARG_PASS_INFO(1) +ZEND_END_ARG_INFO(); + + +ZEND_BEGIN_ARG_INFO(second_arg_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) +ZEND_END_ARG_INFO(); + +ZEND_BEGIN_ARG_INFO(third_arg_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) +ZEND_END_ARG_INFO(); + + +ZEND_BEGIN_ARG_INFO(fourth_arg_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) +ZEND_END_ARG_INFO(); + +ZEND_BEGIN_ARG_INFO(all_args_by_ref, 1) +ZEND_END_ARG_INFO(); + diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 8aa08d55e1..93abe83e50 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -80,37 +80,8 @@ static ZEND_FUNCTION(zend_thread_id); #endif #endif -ZEND_API - ZEND_BEGIN_ARG_INFO(first_arg_force_ref, 0) - ZEND_ARG_PASS_INFO(1) - ZEND_END_ARG_INFO(); - - -ZEND_API - ZEND_BEGIN_ARG_INFO(second_arg_force_ref, 0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(1) - ZEND_END_ARG_INFO(); - -ZEND_API - ZEND_BEGIN_ARG_INFO(third_arg_force_ref, 0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(1) - ZEND_END_ARG_INFO(); - - -ZEND_API - ZEND_BEGIN_ARG_INFO(fourth_arg_force_ref, 0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(1) - ZEND_END_ARG_INFO(); - -ZEND_API - ZEND_BEGIN_ARG_INFO(all_args_by_ref, 1) - ZEND_END_ARG_INFO(); +#include "zend_arg_defs.c" + static zend_function_entry builtin_functions[] = { ZEND_FE(zend_version, NULL) diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h index 1d56f1e89a..bde150364e 100644 --- a/Zend/zend_modules.h +++ b/Zend/zend_modules.h @@ -31,11 +31,11 @@ #define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module TSRMLS_DC #define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module TSRMLS_CC -ZEND_API extern struct _zend_arg_info first_arg_force_ref[2]; -ZEND_API extern struct _zend_arg_info second_arg_force_ref[3]; -ZEND_API extern struct _zend_arg_info third_arg_force_ref[4]; -ZEND_API extern struct _zend_arg_info fourth_arg_force_ref[5]; -ZEND_API extern struct _zend_arg_info all_args_by_ref[1]; +extern struct _zend_arg_info first_arg_force_ref[2]; +extern struct _zend_arg_info second_arg_force_ref[3]; +extern struct _zend_arg_info third_arg_force_ref[4]; +extern struct _zend_arg_info fourth_arg_force_ref[5]; +extern struct _zend_arg_info all_args_by_ref[1]; #define ZEND_MODULE_API_NO 20020429 #ifdef ZTS |