Re: cvs: php-src /ext/spl php_spl.c php_spl.h /ext/tidy php_tidy.h tidy.c

Hello Nuno, it writes the module number in the structure. We could have the macros create a static non const int that receives the module number and reference that from the struct via a pointer, which would be compatible to the struct being static const then. marcus Sunday, January 27, 2008, 6:08:47 PM, you wrote: > Thank you for reverting this. It seems that the Zend engine really requires > right access to these structures. The engine needs "fixing" first. > Thanks, > Nuno > ----- Original Message ----- > From: "Marcus Boerger" <helly@php.net> > To: <php-cvs@lists.php.net> > Sent: Sunday, January 27, 2008 3:03 PM > Subject: [PHP-CVS] cvs: php-src /ext/spl php_spl.c php_spl.h /ext/tidy > php_tidy.h tidy.c >> helly Sun Jan 27 15:03:55 2008 UTC >> >> Modified files: >> /php-src/ext/spl php_spl.c php_spl.h >> /php-src/ext/tidy php_tidy.h tidy.c >> Log: >> - revert over constfying >> >> >> http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.121&r2=1.122&diff_format=u >> Index: php-src/ext/spl/php_spl.c >> diff -u php-src/ext/spl/php_spl.c:1.121 php-src/ext/spl/php_spl.c:1.122 >> --- php-src/ext/spl/php_spl.c:1.121 Fri Jan 25 20:30:36 2008 >> +++ php-src/ext/spl/php_spl.c Sun Jan 27 15:03:55 2008 >> @@ -16,7 +16,7 @@ >> >> +----------------------------------------------------------------------+ >> */ >> >> -/* $Id: php_spl.c,v 1.121 2008/01/25 20:30:36 nlopess Exp $ */ >> +/* $Id: php_spl.c,v 1.122 2008/01/27 15:03:55 helly Exp $ */ >> >> #ifdef HAVE_CONFIG_H >> #include "config.h" >> @@ -781,7 +781,7 @@ >> >> /* {{{ spl_module_entry >> */ >> -const zend_module_entry spl_module_entry = { >> +zend_module_entry spl_module_entry = { >> #ifdef HAVE_SIMPLEXML >> STANDARD_MODULE_HEADER_EX, NULL, >> spl_deps, >> >> http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.h?r1=1.25&r2=1.26&diff_format=u >> Index: php-src/ext/spl/php_spl.h >> diff -u php-src/ext/spl/php_spl.h:1.25 php-src/ext/spl/php_spl.h:1.26 >> --- php-src/ext/spl/php_spl.h:1.25 Fri Jan 25 20:30:36 2008 >> +++ php-src/ext/spl/php_spl.h Sun Jan 27 15:03:55 2008 >> @@ -28,7 +28,7 @@ >> #define SPL_DEBUG(x) >> #endif >> >> -extern const zend_module_entry spl_module_entry; >> +extern zend_module_entry spl_module_entry; >> #define phpext_spl_ptr &spl_module_entry >> >> #ifdef PHP_WIN32 >> >> http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/php_tidy.h?r1=1.37&r2=1.38&diff_format=u >> Index: php-src/ext/tidy/php_tidy.h >> diff -u php-src/ext/tidy/php_tidy.h:1.37 php-src/ext/tidy/php_tidy.h:1.38 >> --- php-src/ext/tidy/php_tidy.h:1.37 Fri Jan 25 20:30:36 2008 >> +++ php-src/ext/tidy/php_tidy.h Sun Jan 27 15:03:55 2008 >> @@ -16,12 +16,12 @@ >> +----------------------------------------------------------------------+ >> */ >> >> -/* $Id: php_tidy.h,v 1.37 2008/01/25 20:30:36 nlopess Exp $ */ >> +/* $Id: php_tidy.h,v 1.38 2008/01/27 15:03:55 helly Exp $ */ >> >> #ifndef PHP_TIDY_H >> #define PHP_TIDY_H >> >> -extern const zend_module_entry tidy_module_entry; >> +extern zend_module_entry tidy_module_entry; >> #define phpext_tidy_ptr &tidy_module_entry >> >> #define TIDY_METHOD_MAP(name, func_name, arg_types) \ >> >> http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.119&r2=1.120&diff_format=u >> Index: php-src/ext/tidy/tidy.c >> diff -u php-src/ext/tidy/tidy.c:1.119 php-src/ext/tidy/tidy.c:1.120 >> --- php-src/ext/tidy/tidy.c:1.119 Fri Jan 25 20:30:36 2008 >> +++ php-src/ext/tidy/tidy.c Sun Jan 27 15:03:55 2008 >> @@ -16,7 +16,7 @@ >> +----------------------------------------------------------------------+ >> */ >> >> -/* $Id: tidy.c,v 1.119 2008/01/25 20:30:36 nlopess Exp $ */ >> +/* $Id: tidy.c,v 1.120 2008/01/27 15:03:55 helly Exp $ */ >> >> #ifdef HAVE_CONFIG_H >> #include "config.h" >> @@ -359,7 +359,7 @@ >> static zend_object_handlers tidy_object_handlers_doc; >> static zend_object_handlers tidy_object_handlers_node; >> >> -const zend_module_entry tidy_module_entry = { >> +zend_module_entry tidy_module_entry = { >> STANDARD_MODULE_HEADER, >> "tidy", >> tidy_functions, >> @@ -1062,7 +1062,7 @@ >> php_info_print_table_start(); >> php_info_print_table_header(2, "Tidy support", "enabled"); >> php_info_print_table_row(2, "libTidy Release", (char >> *)tidyReleaseDate()); >> - php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION >> " ($Id: tidy.c,v 1.119 2008/01/25 20:30:36 nlopess Exp $)"); >> + php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION >> " ($Id: tidy.c,v 1.120 2008/01/27 15:03:55 helly Exp $)"); >> php_info_print_table_end(); >> >> DISPLAY_INI_ENTRIES(); >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php Best regards, Marcus