diff options
| author | Anatol Belski <ab@php.net> | 2014-08-22 08:58:03 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-22 08:58:03 +0200 |
| commit | 79f888a602db3814a6ab03183eff6375bfe9234a (patch) | |
| tree | f1b6d1fb76ca4d613a5cc1b551057dac33d3f585 /ext/standard/php_array.h | |
| parent | da35db3ec5fc4b27087292c067a6ea1d0f77bf8f (diff) | |
| parent | 411b920a6f8d53025caddb30895b27d04a3576b4 (diff) | |
| download | php-git-79f888a602db3814a6ab03183eff6375bfe9234a.tar.gz | |
Merge remote-tracking branch 'weltling/master'POST_64BIT_BRANCH_MERGE
* weltling/master: (725 commits)
fix zpp
fixed array_pad()
fix zpp
fix zpp
fix zpp
fix zpp and a bit more
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fixed the test
...
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 d123ddfe41..2154e603fa 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -107,7 +107,7 @@ 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_replace_recursive(HashTable *dest, HashTable *src TSRMLS_DC); PHPAPI int php_multisort_compare(const void *a, const void *b TSRMLS_DC); -PHPAPI int php_count_recursive(zval *array, long mode TSRMLS_DC); +PHPAPI php_int_t php_count_recursive(zval *array, php_int_t mode TSRMLS_DC); #define PHP_SORT_REGULAR 0 #define PHP_SORT_NUMERIC 1 |