diff options
| author | Andrei Zmievski <andrei@php.net> | 2006-02-07 17:54:24 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2006-02-07 17:54:24 +0000 |
| commit | 7deff63e3c533cc00da67ef43996c44476d2cb17 (patch) | |
| tree | e42fcb9b0f0f487738a3eaa9311e897bf0415230 | |
| parent | 3bafa8cead5b7e747908cf06fbaf7dc61e7a5728 (diff) | |
| download | php-git-7deff63e3c533cc00da67ef43996c44476d2cb17.tar.gz | |
Move array globals declarations back to the header file.
| -rw-r--r-- | ext/standard/array.c | 15 | ||||
| -rw-r--r-- | ext/standard/php_array.h | 13 |
2 files changed, 14 insertions, 14 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index b134524877..2e9b025cf2 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -92,20 +92,7 @@ #define DOUBLE_DRIFT_FIX 0.000000000000001 -ZEND_BEGIN_MODULE_GLOBALS(array) - int *multisort_flags[2]; - int (*compare_func)(zval *result, zval *op1, zval *op2 TSRMLS_DC); -ZEND_END_MODULE_GLOBALS(array) - -ZEND_DECLARE_MODULE_GLOBALS(array) - -#ifdef ZTS -#define ARRAYG(v) TSRMG(array_globals_id, zend_array_globals *, v) -#else -#define ARRAYG(v) (array_globals.v) -#endif - -/* {{{ php_extname_init_globals +/* {{{ php_array_init_globals */ static void php_array_init_globals(zend_array_globals *array_globals) { diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index 649b310a32..6d80348871 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -103,4 +103,17 @@ HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **); PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS_DC); int multisort_compare(const void *a, const void *b TSRMLS_DC); +ZEND_BEGIN_MODULE_GLOBALS(array) + int *multisort_flags[2]; + int (*compare_func)(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_END_MODULE_GLOBALS(array) + +ZEND_DECLARE_MODULE_GLOBALS(array) + +#ifdef ZTS +#define ARRAYG(v) TSRMG(array_globals_id, zend_array_globals *, v) +#else +#define ARRAYG(v) (array_globals.v) +#endif + #endif /* PHP_ARRAY_H */ |