Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4

laruence · laruence · commit 75d23f571479 · 2012-05-03T18:40:57.000+08:00
* origin/PHP-5.3:
  Fix typo
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
@@ -127,7 +127,7 @@ ZEND_API zval *zend_user_it_new_iterator(zend_class_entry *ce, zval *object TSRM
 }
 /* }}} */
 
-/* {{{ zend_user_it_dtor */
+/* {{{ zend_user_it_invalidate_current */
 ZEND_API void zend_user_it_invalidate_current(zend_object_iterator *_iter TSRMLS_DC)
 {
 	zend_user_iterator *iter = (zend_user_iterator*)_iter;

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ ZEND_API zval zend_user_it_new_iterator(zend_class_entry ce, zval *object TSRM`
`127`	`127`	`}`
`128`	`128`	`/* }}} */`
`129`	`129`
`130`		`-/* {{{ zend_user_it_dtor */`
	`130`	`+/* {{{ zend_user_it_invalidate_current */`
`131`	`131`	`ZEND_API void zend_user_it_invalidate_current(zend_object_iterator *_iter TSRMLS_DC)`
`132`	`132`	`{`
`133`	`133`	`zend_user_iterator iter = (zend_user_iterator)_iter;`