diff options
| author | Nikita Popov <nikic@php.net> | 2014-04-09 12:31:35 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-04-09 12:31:35 +0200 |
| commit | 21e01f2b70d133acffd82e505f70b65a996b0fd0 (patch) | |
| tree | b0c599ed18b2d9205cc7d7bb8fb5e8d1579ae1e7 /ext/standard/php_array.h | |
| parent | 6acfaa982bfc88c478013cdca982682d8df0c7cd (diff) | |
| parent | ad2ef3d97edab0d0ce034e65b7e3da1a38cc15dd (diff) | |
| download | php-git-21e01f2b70d133acffd82e505f70b65a996b0fd0.tar.gz | |
Merge branch 'PHP-5.6'
Diffstat (limited to 'ext/standard/php_array.h')
| -rw-r--r-- | ext/standard/php_array.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index c4389dd92a..deddeb4871 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -103,7 +103,7 @@ PHP_FUNCTION(array_key_exists); PHP_FUNCTION(array_chunk); PHP_FUNCTION(array_combine); -PHPAPI HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **); +PHPAPI void php_splice(HashTable *ht, zend_uint offset, zend_uint length, zval ***list, zend_uint list_count, HashTable *removed TSRMLS_DC); PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive 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); |