Fix intl build

class is a reserved keyword in C++...

diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
index b691dce0e03c64fc2132496d5298fb98506dd43d..597dcc3edd22f8257ba9d12407272a11cc3fbb4f 100644 (file)
--- a/Zend/zend_ast.c
+++ b/Zend/zend_ast.c
@@ -102,13 +102,13 @@ ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_constant(zend_string *name, ze
        return (zend_ast *) ast;
 }
 
-ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_class_const_or_name(zend_ast *class, zend_ast *name) {
+ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_class_const_or_name(zend_ast *class_name, zend_ast *name) {
        zend_string *name_str = zend_ast_get_str(name);
        if (zend_string_equals_literal_ci(name_str, "class")) {
                zend_string_release(name_str);
-               return zend_ast_create(ZEND_AST_CLASS_NAME, class);
+               return zend_ast_create(ZEND_AST_CLASS_NAME, class_name);
        } else {
-               return zend_ast_create(ZEND_AST_CLASS_CONST, class, name);
+               return zend_ast_create(ZEND_AST_CLASS_CONST, class_name, name);
        }
 }
 

diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h
index 78d879a3c6599426bcb1dca5b4fa1f2e9c751d27..008d5b19ebcef236170f7da4069982bb6bd3c046 100644 (file)
--- a/Zend/zend_ast.h
+++ b/Zend/zend_ast.h
@@ -201,7 +201,7 @@ ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_zval_from_str(zend_string *str
 ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_zval_from_long(zend_long lval);
 
 ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_constant(zend_string *name, zend_ast_attr attr);
-ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_class_const_or_name(zend_ast *class, zend_ast *name);
+ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_class_const_or_name(zend_ast *class_name, zend_ast *name);
 
 #if ZEND_AST_SPEC
 # define ZEND_AST_SPEC_CALL(name, ...) \