com php-src: fix C89 compat: Zend/zend_ast.c

Commit: d4a05d1990fe6a38d248bba9732fc3911fb204fa Author: Anatol Belski <ab@php.net> Sun, 31 Aug 2014 21:50:00 +0200 Parents: 25f5ba94aca1e89ee5f0c66513e58826afa3b853 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d4a05d1990fe6a38d248bba9732fc3911fb204fa Log: fix C89 compat Changed paths: M Zend/zend_ast.c Diff: diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 1a8be00..2f7c9fd 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -42,8 +42,10 @@ static inline size_t zend_ast_list_size(uint32_t children) { } ZEND_API zend_ast *zend_ast_create_znode(znode *node) { + zend_ast_znode *ast; TSRMLS_FETCH(); - zend_ast_znode *ast = zend_ast_alloc(sizeof(zend_ast_znode) TSRMLS_CC); + + ast = zend_ast_alloc(sizeof(zend_ast_znode) TSRMLS_CC); ast->kind = ZEND_AST_ZNODE; ast->attr = 0; ast->lineno = CG(zend_lineno); @@ -52,8 +54,10 @@ ZEND_API zend_ast *zend_ast_create_znode(znode *node) { } ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) { + zend_ast_zval *ast; TSRMLS_FETCH(); - zend_ast_zval *ast = zend_ast_alloc(sizeof(zend_ast_zval) TSRMLS_CC); + + ast = zend_ast_alloc(sizeof(zend_ast_zval) TSRMLS_CC); ast->kind = ZEND_AST_ZVAL; ast->attr = attr; ZVAL_COPY_VALUE(&ast->val, zv); @@ -65,9 +69,10 @@ ZEND_API zend_ast *zend_ast_create_decl( zend_ast_kind kind, uint32_t flags, uint32_t start_lineno, zend_string *doc_comment, zend_string *name, zend_ast *child0, zend_ast *child1, zend_ast *child2 ) { + zend_ast_decl *ast; TSRMLS_FETCH(); - zend_ast_decl *ast = zend_ast_alloc(sizeof(zend_ast_decl) TSRMLS_CC); + ast = zend_ast_alloc(sizeof(zend_ast_decl) TSRMLS_CC); ast->kind = kind; ast->attr = 0; ast->start_lineno = start_lineno; @@ -84,9 +89,11 @@ ZEND_API zend_ast *zend_ast_create_decl( } static zend_ast *zend_ast_create_from_va_list(zend_ast_kind kind, zend_ast_attr attr, va_list va) { - TSRMLS_FETCH(); uint32_t i, children = kind >> ZEND_AST_NUM_CHILDREN_SHIFT; - zend_ast *ast = zend_ast_alloc(zend_ast_size(children) TSRMLS_CC); + zend_ast *ast; + TSRMLS_FETCH(); + + ast = zend_ast_alloc(zend_ast_size(children) TSRMLS_CC); ast->kind = kind; ast->attr = attr; ast->lineno = (uint32_t) -1; @@ -131,10 +138,12 @@ ZEND_API zend_ast *zend_ast_create(zend_ast_kind kind, ...) { } ZEND_API zend_ast *zend_ast_create_list(uint32_t init_children, zend_ast_kind kind, ...) { + zend_ast *ast; + zend_ast_list *list; TSRMLS_FETCH(); - zend_ast *ast = zend_ast_alloc(zend_ast_list_size(4) TSRMLS_CC); - zend_ast_list *list = (zend_ast_list *) ast; + ast = zend_ast_alloc(zend_ast_list_size(4) TSRMLS_CC); + list = (zend_ast_list *) ast; list->kind = kind; list->attr = 0; list->lineno = CG(zend_lineno);