Move array globals declarations back to the header file.

diff --git a/ext/standard/array.c b/ext/standard/array.c
index b13452487712fadb966914730c66bdf8ec1d934f..2e9b025cf2bf9cb49c8238079f8171880c1517d2 100644 (file)
--- 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 649b310a323d2d15ea5d2e78f5c8ae2c177ab26a..6d80348871c19468bc120c454a41d2a9b64b55cc 100644 (file)
--- 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 */