diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-04 11:03:03 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-04 11:03:03 +0100 |
| commit | 6aa55a28b54d6ec56b51d29fe8b65e5e7a444834 (patch) | |
| tree | 362d32c58ef33a33baf7019a3640402ab94d829b | |
| parent | 290adc41321a6fb0dfe71f1a8058a87ae4c6cab1 (diff) | |
| download | php-git-6aa55a28b54d6ec56b51d29fe8b65e5e7a444834.tar.gz | |
Fix intl build
class is a reserved keyword in C++...
| -rw-r--r-- | Zend/zend_ast.c | 6 | ||||
| -rw-r--r-- | Zend/zend_ast.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index b691dce0e0..597dcc3edd 100644 --- 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 78d879a3c6..008d5b19eb 100644 --- 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, ...) \ |