From c47840d92b784c7f26d77f7bb4c5df8066260396 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 26 Aug 2013 05:54:33 -0700 Subject: some more linux fixes --- ext/standard/php_array.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/php_array.h') diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index 1cf2779071..85002ebeeb 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 HashTable* php_splice(HashTable *, php_int_t, php_int_t, zval ***, php_int_t, 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); -- cgit v1.2.1 From 4be58a12d840500ccaf4efd2cca524f73310db42 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 15 Apr 2014 09:59:01 +0200 Subject: fixed prototype --- ext/standard/php_array.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/php_array.h') diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index 7911a36a00..36359e98e9 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -107,7 +107,7 @@ PHPAPI void php_splice(HashTable *ht, php_uint_t offset, php_size_t length, zval 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 -- cgit v1.2.1 From b8324e6d635450562ecb253af38f22105e19e460 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 18 Aug 2014 16:50:54 +0200 Subject: further fixes to ext/standard --- ext/standard/php_array.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/php_array.h') 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 -- cgit v1.2.1 From c3e3c98ec666812daaaca896cf5ef758a8a6df14 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 19:24:55 +0200 Subject: master renames phase 1 --- ext/standard/php_array.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/php_array.h') diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index 2154e603fa..c001ee5509 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 php_int_t php_count_recursive(zval *array, php_int_t mode TSRMLS_DC); +PHPAPI zend_long php_count_recursive(zval *array, zend_long mode TSRMLS_DC); #define PHP_SORT_REGULAR 0 #define PHP_SORT_NUMERIC 1 -- cgit v1.2.1