diff options
| author | Xinchen Hui <laruence@php.net> | 2013-11-04 14:47:34 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-11-04 14:47:34 +0800 |
| commit | 2f555b8e606b5f09d635cef4d3fcbcd6939adae2 (patch) | |
| tree | f2497158b9b7d575582b06d165e0b033bee6d19e /ext/standard/php_array.h | |
| parent | 15eabbb43602ea7020ef7b6d99260e338fcc3aee (diff) | |
| parent | e5e25c43f476456f5b342d4cd289d0ce5f8bbac4 (diff) | |
| download | php-git-2f555b8e606b5f09d635cef4d3fcbcd6939adae2.tar.gz | |
Merge branch 'master' of git.php.net:php-src
Diffstat (limited to 'ext/standard/php_array.h')
| -rw-r--r-- | ext/standard/php_array.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index 1cf2779071..ef43cddfcc 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -117,6 +117,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 ARRAY_FILTER_USE_BOTH 1 +#define ARRAY_FILTER_USE_KEY 2 + ZEND_BEGIN_MODULE_GLOBALS(array) int *multisort_flags[2]; int (*compare_func)(zval *result, zval *op1, zval *op2 TSRMLS_DC); |