avoid using 'class' in exported functions - it annoys c++

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index f6f850362d1247432e4f06c82b531f7d73b87634..3dcb506c16d787ab8a023bacae4524981cd38233 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -304,7 +304,7 @@ void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC)
        fetch_simple_variable_ex(result, varname, bp, ZEND_FETCH_W TSRMLS_CC);
 }
 
-void zend_do_fetch_static_member(znode *class TSRMLS_DC)
+void zend_do_fetch_static_member(znode *class_znode TSRMLS_DC)
 {
        zend_llist *fetch_list_ptr;
        zend_llist_element *le;
@@ -314,7 +314,7 @@ void zend_do_fetch_static_member(znode *class TSRMLS_DC)
        le = fetch_list_ptr->head;
 
        opline_ptr = (zend_op *)le->data;
-       opline_ptr->op2 = *class;
+       opline_ptr->op2 = *class_znode;
        opline_ptr->op2.u.EA.type = ZEND_FETCH_STATIC_MEMBER;
 }
 
@@ -2692,7 +2692,7 @@ void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC
 }
 
 
-void zend_do_is_class(znode *result, znode *expr, znode *class, int type TSRMLS_DC)
+void zend_do_is_class(znode *result, znode *expr, znode *class_znode, int type TSRMLS_DC)
 {
        zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
 
@@ -2701,7 +2701,7 @@ void zend_do_is_class(znode *result, znode *expr, znode *class, int type TSRMLS_
        opline->result.u.var = get_temporary_variable(CG(active_op_array));
        opline->op1 = *expr;
 
-       opline->op2 = *class;
+       opline->op2 = *class_znode;
 
        *result = opline->result;
 }

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index be6ed9407850836df02b1058d33e69f00a539164..5860eecdd4cc865ae49945a01383a6e481a6f18b 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -262,7 +262,7 @@ void zend_do_fetch_global_or_static_variable(znode *varname, znode *static_assig
 void fetch_array_begin(znode *result, znode *varname, znode *first_dim TSRMLS_DC);
 void fetch_array_dim(znode *result, znode *parent, znode *dim TSRMLS_DC);
 void fetch_string_offset(znode *result, znode *parent, znode *offset TSRMLS_DC);
-void zend_do_fetch_static_member(znode *class TSRMLS_DC);
+void zend_do_fetch_static_member(znode *class_znode TSRMLS_DC);
 void zend_do_print(znode *result, znode *arg TSRMLS_DC);
 void zend_do_echo(znode *arg TSRMLS_DC);
 typedef int (*unary_op_type)(zval *, zval *);
@@ -371,7 +371,7 @@ void zend_do_include_or_eval(int type, znode *result, znode *op1 TSRMLS_DC);
 void zend_do_unset(znode *variable TSRMLS_DC);
 void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC);
 
-void zend_do_is_class(znode *result, znode *expr, znode *class, int type TSRMLS_DC);
+void zend_do_is_class(znode *result, znode *expr, znode *class_znode, int type TSRMLS_DC);
 
 void zend_do_foreach_begin(znode *foreach_token, znode *array, znode *open_brackets_token, znode *as_token, int variable TSRMLS_DC);
 void zend_do_foreach_cont(znode *value, znode *key, znode *as_token TSRMLS_DC);