From b29b4441dbc91bd1bc05bff929f198e0e3ae1211 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Fri, 15 Aug 2003 21:02:35 +0000 Subject: [PATCH] Restrict scope of inline functions to compile unit Submitted by: Jason Greene --- Zend/zend_execute.c | 10 +++++----- Zend/zend_object_handlers.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index b24e8ab106..80f064e968 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1562,7 +1562,7 @@ static inline int zend_binary_assign_op_obj_helper(int (*binary_op)(zval *result } -inline int zend_binary_assign_op_helper(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS) +static inline int zend_binary_assign_op_helper(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS) { zval **var_ptr; zval *value; @@ -1722,7 +1722,7 @@ int zend_post_dec_obj_handler(ZEND_OPCODE_HANDLER_ARGS) } -inline int zend_incdec_op_helper(void *incdec_op_arg, ZEND_OPCODE_HANDLER_ARGS) +static inline int zend_incdec_op_helper(void *incdec_op_arg, ZEND_OPCODE_HANDLER_ARGS) { zval **var_ptr = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_RW); int (*incdec_op)(zval *op1) = incdec_op_arg; @@ -2779,7 +2779,7 @@ int zend_send_val_handler(ZEND_OPCODE_HANDLER_ARGS) } -inline int zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS) +static inline int zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS) { zval *varptr; varptr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); @@ -2934,7 +2934,7 @@ int zend_bool_handler(ZEND_OPCODE_HANDLER_ARGS) } -inline int zend_brk_cont_helper(ZEND_OPCODE_HANDLER_ARGS) +static inline int zend_brk_cont_helper(ZEND_OPCODE_HANDLER_ARGS) { zval *nest_levels_zval = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); zval tmp; @@ -3152,7 +3152,7 @@ int zend_fetch_constant_handler(ZEND_OPCODE_HANDLER_ARGS) } -inline int zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS) +static inline int zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS) { zval *array_ptr = &EX_T(EX(opline)->result.u.var).tmp_var; zval *expr_ptr, **expr_ptr_ptr = NULL; diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 4d1589ace9..521efa9cea 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -154,7 +154,7 @@ static int zend_std_call_setter(zval *object, zval *member, zval *value TSRMLS_D } -inline int zend_verify_property_access(zend_property_info *property_info, zend_class_entry *ce TSRMLS_DC) +static inline int zend_verify_property_access(zend_property_info *property_info, zend_class_entry *ce TSRMLS_DC) { switch (property_info->flags & ZEND_ACC_PPP_MASK) { case ZEND_ACC_PUBLIC: -- 2.40.0