diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-04-14 00:08:36 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-04-14 00:08:36 +0200 |
| commit | a93e734f8143815bcb4f675567146d4326c05fb9 (patch) | |
| tree | bc4024839e77db0f21c028b5aa955e862620dc63 /ext/standard/php_array.h | |
| parent | 0e023e978445a7d2f723cabfd4a59d65886be72a (diff) | |
| parent | bf3edbada68cb99f4c67f60fe113a6cf0b44e0fa (diff) | |
| download | php-git-a93e734f8143815bcb4f675567146d4326c05fb9.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'ext/standard/php_array.h')
| -rw-r--r-- | ext/standard/php_array.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index deddeb4871..1b30e34787 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -107,6 +107,7 @@ PHPAPI void php_splice(HashTable *ht, zend_uint offset, zend_uint 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); #define PHP_SORT_REGULAR 0 #define PHP_SORT_NUMERIC 1 @@ -117,6 +118,9 @@ PHPAPI int php_multisort_compare(const void *a, const void *b TSRMLS_DC); #define PHP_SORT_NATURAL 6 #define PHP_SORT_FLAG_CASE 8 +#define COUNT_NORMAL 0 +#define COUNT_RECURSIVE 1 + #define ARRAY_FILTER_USE_BOTH 1 #define ARRAY_FILTER_USE_KEY 2 |