From 974671ecede4d7b998e42eac131095065777e59f Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Thu, 27 Apr 2000 21:48:47 +0000 Subject: [PATCH] *** empty log message *** --- Zend/zend-scanner.l | 4 ++-- Zend/zend.c | 2 +- Zend/zend_compile.c | 2 +- Zend/zend_compile.h | 4 ++-- Zend/zend_execute.c | 2 +- Zend/zend_extensions.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l index 98707a857b3..d7425cae2db 100644 --- a/Zend/zend-scanner.l +++ b/Zend/zend-scanner.l @@ -316,13 +316,13 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle CLS_DC) END_EXTERN_C() -ZEND_API zend_op_array *compile_files(int type CLS_DC, int file_count, ...) +ZEND_API zend_op_array *zend_compile_files(int type CLS_DC, int file_count, ...) { va_list files; zend_op_array *op_array; va_start(files, file_count); - op_array = v_compile_files(type CLS_CC, file_count, files); + op_array = zend_v_compile_files(type CLS_CC, file_count, files); va_end(files); return op_array; } diff --git a/Zend/zend.c b/Zend/zend.c index 7716a27f60d..99a836ccaa5 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -324,7 +324,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i zend_get_ini_entry_p = utility_functions->get_ini_entry; zend_ticks_function = utility_functions->ticks_function; - zend_compile_files = compile_files; + zend_v_compile_files = v_compile_files; zend_execute = execute; zend_llist_init(&zend_extensions, sizeof(zend_extension), (void (*)(void *)) zend_extension_dtor, 1); diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index e635079821c..ef6437cea96 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -26,7 +26,7 @@ #include "zend_fast_cache.h" -ZEND_API zend_op_array *(*zend_compile_files)(int type CLS_DC, int file_count, ...); +ZEND_API zend_op_array *(*zend_v_compile_files)(int type CLS_DC, int file_count, va_list files); #ifndef ZTS diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index b24182287dd..4551ab1d48d 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -205,7 +205,7 @@ BEGIN_EXTERN_C() void init_compiler(CLS_D ELS_DC); void shutdown_compiler(CLS_D); -extern ZEND_API zend_op_array *(*zend_compile_files)(int type CLS_DC, int file_count, ...); +extern ZEND_API zend_op_array *(*zend_v_compile_files)(int type CLS_DC, int file_count, va_list files); void zend_activate(CLS_D ELS_DC); void zend_deactivate(CLS_D ELS_DC); @@ -368,7 +368,7 @@ void do_ticks(CLS_D); ZEND_API int require_file(zend_file_handle *file_handle, zend_bool unique CLS_DC); ZEND_API int require_filename(char *filename, zend_bool unique CLS_DC); ZEND_API int use_filename(char *filename, uint filename_length CLS_DC); -ZEND_API zend_op_array *compile_files(int type CLS_DC, int file_count, ...); +ZEND_API zend_op_array *zend_compile_files(int type CLS_DC, int file_count, ...); ZEND_API zend_op_array *v_compile_files(int type CLS_DC, int file_count, va_list files); ZEND_API zend_op_array *compile_string(zval *source_string CLS_DC); ZEND_API zend_op_array *compile_filename(int type, zval *filename CLS_DC ELS_DC); diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index f00955ab6e0..972371c82c1 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2056,7 +2056,7 @@ send_by_ref: if (file_handle.handle.fp) { if (!opened_path || zend_hash_add(&EG(included_files), opened_path, strlen(opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) { - new_op_array = compile_files(ZEND_INCLUDE CLS_CC, 1, &file_handle); + new_op_array = zend_compile_files(ZEND_INCLUDE CLS_CC, 1, &file_handle); if (new_op_array) { pass_include_eval(new_op_array); } else { diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h index 94e29f73afb..34f83b1f404 100644 --- a/Zend/zend_extensions.h +++ b/Zend/zend_extensions.h @@ -23,7 +23,7 @@ #include "zend_compile.h" -#define ZEND_EXTENSION_API_NO 20000405 +#define ZEND_EXTENSION_API_NO 20000428 typedef struct _zend_extension_version_info { int zend_extension_api_no;