From: Felipe Pena <felipe@php.net>
Date: Fri, 23 Apr 2010 01:43:27 +0000 (+0000)
Subject: - Fix function signature
X-Git-Tag: php-5.4.0alpha1~191^2~1679
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a8632a1442363b34535c805a0db100539617126;p=php

- Fix function signature
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 7333b68fb6..b809d3c130 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3219,7 +3219,7 @@ ZEND_API void zend_do_implement_trait(zend_class_entry *ce, zend_class_entry *tr
 }
 /* }}} */
 
-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 @@ void php_runkit_function_copy_ctor(zend_function *fe, char *newname)
 }
 /* }}}} */
 
-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;