andrei Tue Feb 7 17:54:24 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard array.c php_array.h
Log:
Move array globals declarations back to the header file.
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/array.c?r1=1.308.2.16&r2=1.308.2.17&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.16
php-src/ext/standard/array.c:1.308.2.17
--- php-src/ext/standard/array.c:1.308.2.16 Sun Jan 1 12:50:14 2006
+++ php-src/ext/standard/array.c Tue Feb 7 17:54:24 2006
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.16 2006/01/01 12:50:14 sniper Exp $ */
+/* $Id: array.c,v 1.308.2.17 2006/02/07 17:54:24 andrei Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -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)
{
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/php_array.h?r1=1.50.2.1&r2=1.50.2.2&diff_format=u
Index: php-src/ext/standard/php_array.h
diff -u php-src/ext/standard/php_array.h:1.50.2.1
php-src/ext/standard/php_array.h:1.50.2.2
--- php-src/ext/standard/php_array.h:1.50.2.1 Sun Jan 1 12:50:15 2006
+++ php-src/ext/standard/php_array.h Tue Feb 7 17:54:24 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_array.h,v 1.50.2.1 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: php_array.h,v 1.50.2.2 2006/02/07 17:54:24 andrei Exp $ */
#ifndef PHP_ARRAY_H
#define PHP_ARRAY_H
@@ -103,4 +103,17 @@
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 */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
