"This" is C++ keyword

diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index d98e2715df1354b1484efafd04ea0ef133607e04..13997627029f6e2d495b82a349cfcaff1ed1e88b 100644 (file)
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -463,12 +463,12 @@ static void zend_generator_add_child(zend_generator *generator, zend_generator *
        }
 }
 
-void zend_generator_yield_from(zend_generator *this, zend_generator *from)
+void zend_generator_yield_from(zend_generator *generator, zend_generator *from)
 {
-       zend_generator_add_child(from, this);
+       zend_generator_add_child(from, generator);
 
-       this->node.parent = from;
-       zend_generator_get_current(this);
+       generator->node.parent = from;
+       zend_generator_get_current(generator);
        --GC_REFCOUNT(from);
 }
 

diff --git a/Zend/zend_generators.h b/Zend/zend_generators.h
index ae1e312eee5052e6098ba51aea90e30e18ef2578..3b41ec9fb1431b41a1964a4fd55b9abddaab8e3e 100644 (file)
--- a/Zend/zend_generators.h
+++ b/Zend/zend_generators.h
@@ -103,7 +103,7 @@ ZEND_API void zend_generator_create_zval(zend_execute_data *call, zend_op_array
 ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished_execution);
 ZEND_API void zend_generator_resume(zend_generator *generator);
 
-void zend_generator_yield_from(zend_generator *this, zend_generator *from);
+void zend_generator_yield_from(zend_generator *generator, zend_generator *from);
 ZEND_API zend_generator *zend_generator_get_current(zend_generator *generator);
 ZEND_API zend_execute_data *zend_generator_check_placeholder_frame(zend_execute_data *ptr);