helly Fri Nov 18 17:59:09 2005 EDT
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
- Disabled globals code in a way that does not affect purist or old compilers
http://cvs.php.net/diff.php/php-src/ext/reflection/php_reflection.c?r1=1.190&r2=1.191&ty=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.190
php-src/ext/reflection/php_reflection.c:1.191
--- php-src/ext/reflection/php_reflection.c:1.190 Thu Nov 17 17:59:38 2005
+++ php-src/ext/reflection/php_reflection.c Fri Nov 18 17:59:07 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.190 2005/11/17 22:59:38 helly Exp $ */
+/* $Id: php_reflection.c,v 1.191 2005/11/18 22:59:07 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -50,7 +50,9 @@
PHPAPI zend_class_entry *reflection_property_ptr;
PHPAPI zend_class_entry *reflection_extension_ptr;
+#if MBO_0
ZEND_BEGIN_MODULE_GLOBALS(reflection)
+ int dummy;
ZEND_END_MODULE_GLOBALS(reflection)
#ifdef ZTS
@@ -62,11 +64,8 @@
extern zend_reflection_globals reflectionglobals;
#endif
-#ifdef COMPILE_DL_REFLECTION
-ZEND_GET_MODULE(reflection)
-#endif
-
ZEND_DECLARE_MODULE_GLOBALS(reflection)
+#endif /* MBO_0 */
/* Method macros */
@@ -4184,17 +4183,10 @@
}
/* }}} */
-static void reflection_init_globals(zend_reflection_globals *globals) /* {{{ */
-{
- /* Initialize your global struct */
-} /* }}} */
-
PHP_MINIT_FUNCTION(reflection) /* {{{ */
{
zend_class_entry _reflection_entry;
- ZEND_INIT_MODULE_GLOBALS(reflection, reflection_init_globals, NULL);
-
zend_std_obj_handlers = zend_get_std_object_handlers();
memcpy(&reflection_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
reflection_object_handlers.clone_obj = NULL;
@@ -4278,7 +4270,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.190
2005/11/17 22:59:38 helly Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.191
2005/11/18 22:59:07 helly Exp $");
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
