Commit:    4a7d1b4ed8987188c3a628601ad9a027bf88b7eb
Author:    Pierre Joye <pierre....@gmail.com>         Wed, 5 Sep 2012 12:53:29 
+0200
Parents:   bceec038c833d830a3f37d4eb14a778104eb2766
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=4a7d1b4ed8987188c3a628601ad9a027bf88b7eb

Log:
- fix build, declarations must be 1st in a contextgit checkout -f master

Changed paths:
  M  Zend/zend_generators.c


Diff:
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 3d4fdd2..83025ea 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -363,6 +363,9 @@ zval *zend_generator_create_zval(zend_op_array *op_array 
TSRMLS_DC) /* {{{ */
 {
        zval *return_value;
        zend_generator *generator;
+       zend_execute_data *current_execute_data;
+       zend_op **opline_ptr;
+       zend_execute_data *execute_data;
 
        /* Create a clone of closure, because it may be destroyed */
        if (op_array->fn_flags & ZEND_ACC_CLOSURE) {
@@ -375,9 +378,9 @@ zval *zend_generator_create_zval(zend_op_array *op_array 
TSRMLS_DC) /* {{{ */
        /* Create new execution context. We have to back up and restore
         * EG(current_execute_data) and EG(opline_ptr) here because the function
         * modifies it. */
-       zend_execute_data *current_execute_data = EG(current_execute_data);
-       zend_op **opline_ptr = EG(opline_ptr);
-       zend_execute_data *execute_data = 
zend_create_execute_data_from_op_array(op_array, 0 TSRMLS_CC);
+       current_execute_data = EG(current_execute_data);
+       opline_ptr = EG(opline_ptr);
+       execute_data = zend_create_execute_data_from_op_array(op_array, 0 
TSRMLS_CC);
        EG(current_execute_data) = current_execute_data;
        EG(opline_ptr) = opline_ptr;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to