diff options
| author | Sascha Schumann <sas@php.net> | 1999-12-05 16:23:45 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-12-05 16:23:45 +0000 |
| commit | 70df2d74780e8e03d066ce682609a27ed426e9d6 (patch) | |
| tree | 6c27fc9f9c971a7807fbc4498a595cb2561052bc | |
| parent | e5d956dbac4c3ef2c71f8a0a0080a7840032798a (diff) | |
| download | php-git-70df2d74780e8e03d066ce682609a27ed426e9d6.tar.gz | |
Fix some warnings
| -rw-r--r-- | Zend/zend-parser.y | 4 | ||||
| -rw-r--r-- | Zend/zend.c | 2 | ||||
| -rw-r--r-- | Zend/zend_API.c | 1 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 1 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 1 |
5 files changed, 3 insertions, 6 deletions
diff --git a/Zend/zend-parser.y b/Zend/zend-parser.y index ec23addf7d..bd3e04026b 100644 --- a/Zend/zend-parser.y +++ b/Zend/zend-parser.y @@ -130,7 +130,7 @@ %% /* Rules */ top_statement_list: - top_statement_list { do_extended_info(CLS_C); } top_statement { ELS_FETCH(); HANDLE_INTERACTIVE(); } + top_statement_list { do_extended_info(CLS_C); } top_statement { HANDLE_INTERACTIVE(); } | /* empty */ ; @@ -142,7 +142,7 @@ top_statement: inner_statement_list: - inner_statement_list { do_extended_info(CLS_C); } inner_statement { ELS_FETCH(); HANDLE_INTERACTIVE(); } + inner_statement_list { do_extended_info(CLS_C); } inner_statement { HANDLE_INTERACTIVE(); } | /* empty */ ; diff --git a/Zend/zend.c b/Zend/zend.c index b62eec41b1..83800b54e4 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -294,7 +294,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) zend_compiler_globals *compiler_globals; zend_executor_globals *executor_globals; - alloc_globals_id = ts_allocate_id(sizeof(zend_alloc_globals), alloc_globals_ctor, NULL); + alloc_globals_id = ts_allocate_id(sizeof(zend_alloc_globals), (ts_allocate_ctor) alloc_globals_ctor, NULL); #else start_memory_manager(ALS_C); #endif diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 1f267f770d..912811eb44 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -42,7 +42,6 @@ ZEND_API int getParameters(int ht, int param_count,...) va_list ptr; zval **param, *param_ptr; ELS_FETCH(); - ALS_FETCH(); p = EG(argument_stack).top_element-1; arg_count = (ulong) *p; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index a21c2ed16e..2dd02430ab 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -830,7 +830,6 @@ void do_begin_class_member_function_call(znode *class_name, znode *function_name void do_end_function_call(znode *function_name, znode *result, znode *argument_list, int is_method, int is_dynamic_fcall CLS_DC) { zend_op *opline = get_next_op(CG(active_op_array) CLS_CC); - ELS_FETCH(); if (function_name->op_type==IS_CONST && !is_method && !is_dynamic_fcall) { opline->opcode = ZEND_DO_FCALL; diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 5ad78d57cb..40bea67381 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -314,7 +314,6 @@ int call_user_function_ex(HashTable *function_table, zval *object, zval *functio zend_function_state *original_function_state_ptr; zend_op_array *original_op_array; zend_op **original_opline_ptr; - CLS_FETCH(); ELS_FETCH(); if (object) { |