From 4e66cce87ce0e57a7394486412e61abcfc5f3520 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 29 Jul 2015 12:26:23 +0200 Subject: switch to the unified globals accessor where appropriate --- ext/standard/php_array.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'ext/standard/php_array.h') diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index 8176e175bc..fb33341030 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -129,10 +129,6 @@ ZEND_BEGIN_MODULE_GLOBALS(array) int (*compare_func)(zval *result, zval *op1, zval *op2); ZEND_END_MODULE_GLOBALS(array) -#ifdef ZTS -#define ARRAYG(v) ZEND_TSRMG(array_globals_id, zend_array_globals *, v) -#else -#define ARRAYG(v) (array_globals.v) -#endif +#define ARRAYG(v) ZEND_MODULE_GLOBALS_ACCESSOR(array, v) #endif /* PHP_ARRAY_H */ -- cgit v1.2.1 From c174e4cd73cd16ce0b52ab66a90e97c476a444fe Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 10 Sep 2015 02:51:23 +0300 Subject: Change array sorting implementation to avoid two level callbacks system. Simplify zval comparion API. --- ext/standard/php_array.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ext/standard/php_array.h') diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index fb33341030..ba2490c98b 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -125,8 +125,7 @@ PHPAPI zend_long php_count_recursive(zval *array, zend_long mode); #define ARRAY_FILTER_USE_KEY 2 ZEND_BEGIN_MODULE_GLOBALS(array) - int *multisort_flags[2]; - int (*compare_func)(zval *result, zval *op1, zval *op2); + compare_func_t *multisort_func; ZEND_END_MODULE_GLOBALS(array) #define ARRAYG(v) ZEND_MODULE_GLOBALS_ACCESSOR(array, v) -- cgit v1.2.1 From 49493a2dcfb2cd1758b69b13d9006ead3be0e066 Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Fri, 1 Jan 2016 19:19:27 +0200 Subject: Happy new year (Update copyright to 2016) --- 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 40307357c7..64c7701fec 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 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 | -- cgit v1.2.1