diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/standard/php_array.h | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/standard/php_array.h')
| -rw-r--r-- | ext/standard/php_array.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index f8479e2700..6c06be983e 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -1,4 +1,4 @@ -/* +/* +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ @@ -124,10 +124,10 @@ PHPAPI zend_long php_count_recursive(zval *array, zend_long mode); #define ARRAY_FILTER_USE_BOTH 1 #define ARRAY_FILTER_USE_KEY 2 -ZEND_BEGIN_MODULE_GLOBALS(array) +ZEND_BEGIN_MODULE_GLOBALS(array) int *multisort_flags[2]; int (*compare_func)(zval *result, zval *op1, zval *op2); -ZEND_END_MODULE_GLOBALS(array) +ZEND_END_MODULE_GLOBALS(array) #ifdef ZTS #define ARRAYG(v) ZEND_TSRMG(array_globals_id, zend_array_globals *, v) |