cvs: php-src(PHP_5_2) /ext/standard array.c php_array.h

andrei Sat Jun 3 18:56:44 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard array.c php_array.h Log: I swear it wasn't me. http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/array.c?r1=1.308.2.21&r2=1.308.2.21.2.1&diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.308.2.21 php-src/ext/standard/array.c:1.308.2.21.2.1 --- php-src/ext/standard/array.c:1.308.2.21 Wed Apr 12 19:30:52 2006 +++ php-src/ext/standard/array.c Sat Jun 3 18:56:44 2006 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.308.2.21 2006/04/12 19:30:52 johannes Exp $ */ +/* $Id: array.c,v 1.308.2.21.2.1 2006/06/03 18:56:44 andrei Exp $ */ #include "php.h" #include "php_ini.h" @@ -92,6 +92,8 @@ #define DOUBLE_DRIFT_FIX 0.000000000000001 +ZEND_DECLARE_MODULE_GLOBALS(array) + /* {{{ 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.2&r2=1.50.2.2.2.1&diff_format=u Index: php-src/ext/standard/php_array.h diff -u php-src/ext/standard/php_array.h:1.50.2.2 php-src/ext/standard/php_array.h:1.50.2.2.2.1 --- php-src/ext/standard/php_array.h:1.50.2.2 Tue Feb 7 17:54:24 2006 +++ php-src/ext/standard/php_array.h Sat Jun 3 18:56:44 2006 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_array.h,v 1.50.2.2 2006/02/07 17:54:24 andrei Exp $ */ +/* $Id: php_array.h,v 1.50.2.2.2.1 2006/06/03 18:56:44 andrei Exp $ */ #ifndef PHP_ARRAY_H #define PHP_ARRAY_H @@ -108,8 +108,6 @@ 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