diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
| commit | b68da91d52801fb2cc4d2a4a44c859ea5b6c622b (patch) | |
| tree | 290f7c8ea7fd2df02c995b07c1d490c2de333db5 /ext/standard/php_array.h | |
| parent | 4f6539bdaf62f0343f4ec67638d2f96e8c1c00ae (diff) | |
| parent | a9e86957c70c181e830ba05bb030c468d0cb15e1 (diff) | |
| download | php-git-b68da91d52801fb2cc4d2a4a44c859ea5b6c622b.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
Diffstat (limited to 'ext/standard/php_array.h')
| -rw-r--r-- | ext/standard/php_array.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index 31955042eb..b35ce30c8b 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -104,11 +104,11 @@ PHP_FUNCTION(array_chunk); PHP_FUNCTION(array_combine); PHPAPI HashTable* php_splice(HashTable *, int, int, zval *, int, HashTable *); -PHPAPI int php_array_merge(HashTable *dest, HashTable *src TSRMLS_DC); -PHPAPI int php_array_merge_recursive(HashTable *dest, HashTable *src 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 zend_long php_count_recursive(zval *array, zend_long mode TSRMLS_DC); +PHPAPI int php_array_merge(HashTable *dest, HashTable *src); +PHPAPI int php_array_merge_recursive(HashTable *dest, HashTable *src); +PHPAPI int php_array_replace_recursive(HashTable *dest, HashTable *src); +PHPAPI int php_multisort_compare(const void *a, const void *b); +PHPAPI zend_long php_count_recursive(zval *array, zend_long mode); #define PHP_SORT_REGULAR 0 #define PHP_SORT_NUMERIC 1 @@ -127,11 +127,11 @@ PHPAPI zend_long php_count_recursive(zval *array, zend_long mode TSRMLS_DC); ZEND_BEGIN_MODULE_GLOBALS(array) int *multisort_flags[2]; - int (*compare_func)(zval *result, zval *op1, zval *op2 TSRMLS_DC); + int (*compare_func)(zval *result, zval *op1, zval *op2); ZEND_END_MODULE_GLOBALS(array) #ifdef ZTS -#define ARRAYG(v) TSRMG(array_globals_id, zend_array_globals *, v) +#define ARRAYG(v) ZEND_TSRMG(array_globals_id, zend_array_globals *, v) #else #define ARRAYG(v) (array_globals.v) #endif |