tony2001 Thu Jun 1 14:31:22 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/reflection php_reflection.c
Log:
apply correct fix
http://cvs.php.net/viewcvs.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.2&r2=1.164.2.33.2.3&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.2
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.3
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.2 Thu Jun 1
12:25:38 2006
+++ php-src/ext/reflection/php_reflection.c Thu Jun 1 14:31:22 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.2 2006/06/01 12:25:38 tony2001 Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.3 2006/06/01 14:31:22 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2926,7 +2926,7 @@
/* }}} */
/* {{{ _addmethod */
-static int _addmethod(zend_function *mptr, int num_args, va_list args,
zend_hash_key *hash_key TSRMLS_DC)
+static int _addmethod(zend_function *mptr, int num_args, va_list args,
zend_hash_key *hash_key)
{
zval *method;
zend_class_entry *ce = *va_arg(args, zend_class_entry**);
@@ -2934,6 +2934,7 @@
long filter = va_arg(args, long);
if (mptr->common.fn_flags & filter) {
+ TSRMLS_FETCH();
ALLOC_ZVAL(method);
reflection_method_factory(ce, mptr, method TSRMLS_CC);
add_next_index_zval(retval, method);
@@ -3055,7 +3056,7 @@
/* }}} */
/* {{{ _addproperty */
-static int _addproperty(zend_property_info *pptr, int num_args, va_list args,
zend_hash_key *hash_key TSRMLS_DC)
+static int _addproperty(zend_property_info *pptr, int num_args, va_list args,
zend_hash_key *hash_key)
{
zval *property;
zend_class_entry *ce = *va_arg(args, zend_class_entry**);
@@ -3067,6 +3068,7 @@
}
if (pptr->flags & filter) {
+ TSRMLS_FETCH();
ALLOC_ZVAL(property);
reflection_property_factory(ce, pptr, property TSRMLS_CC);
add_next_index_zval(retval, property);
@@ -4483,7 +4485,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.2 2006/06/01 12:25:38 tony2001 Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.3 2006/06/01 14:31:22 tony2001 Exp $");
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php