From 381438e5df4534d5b2f0d5c7008289d35d4c372a Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 11 Dec 2014 19:18:31 +0300 Subject: Improved array_merge() and array_replace() (1-st array may be added using simple procedure). --- ext/standard/php_array.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ext/standard/php_array.h') diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index d86121b277..31955042eb 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -104,7 +104,8 @@ PHP_FUNCTION(array_chunk); PHP_FUNCTION(array_combine); PHPAPI HashTable* php_splice(HashTable *, int, int, zval *, int, HashTable *); -PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS_DC); +PHPAPI int php_array_merge(HashTable *dest, HashTable *src TSRMLS_DC); +PHPAPI int php_array_merge_recursive(HashTable *dest, HashTable *src TSRMLS_DC); PHPAPI int php_array_replace_recursive(HashTable *dest, HashTable *src TSRMLS_DC); PHPAPI int php_multisort_compare(const void *a, const void *b TSRMLS_DC); PHPAPI zend_long php_count_recursive(zval *array, zend_long mode TSRMLS_DC); -- cgit v1.2.1