felipe                                   Fri, 23 Apr 2010 01:43:27 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=298359

Log:
- Fix function signature

Changed paths:
    U   php/php-src/trunk/Zend/zend_compile.c

Modified: php/php-src/trunk/Zend/zend_compile.c
===================================================================
--- php/php-src/trunk/Zend/zend_compile.c       2010-04-23 01:10:05 UTC (rev 
298358)
+++ php/php-src/trunk/Zend/zend_compile.c       2010-04-23 01:43:27 UTC (rev 
298359)
@@ -3219,7 +3219,7 @@
 }
 /* }}} */

-static int _merge_functions(zend_function *fn, int num_args, va_list args, 
zend_hash_key *hash_key) /* {{{ */
+static int _merge_functions(zend_function *fn TSRMLS_DC, int num_args, va_list 
args, zend_hash_key *hash_key) /* {{{ */
 {
        size_t current;
        size_t i;
@@ -3399,7 +3399,7 @@
 }
 /* }}}} */

-static int _merge_functions_to_class(zend_function *fn, int num_args, va_list 
args, zend_hash_key *hash_key TSRMLS_DC)
+static int _merge_functions_to_class(zend_function *fn TSRMLS_DC, int 
num_args, va_list args, zend_hash_key *hash_key)
 {
        zend_class_entry *ce = va_arg(args, zend_class_entry*);
        int add = 0;

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

Reply via email to