diff options
| author | Ondřej Surý <ondrej@sury.org> | 2014-01-28 10:57:59 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2014-01-28 10:57:59 +0100 |
| commit | 575107aad92a460051e02de029067359083542b9 (patch) | |
| tree | 462d4270312d11a5c064e151e3fdd2f671bd540b /ext/standard/php_array.h | |
| parent | 650fb41a77b3a24ab4130b05fff243b64b241877 (diff) | |
| download | php-575107aad92a460051e02de029067359083542b9.tar.gz | |
New upstream version 5.6.0~alpha1+dfsgupstream/5.6.0_alpha1+dfsg
Diffstat (limited to 'ext/standard/php_array.h')
| -rw-r--r-- | ext/standard/php_array.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index 1cf277907..c4389dd92 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -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); |