helly Sun Jan 27 15:04:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/spl php_spl.c php_spl.h
/php-src/ext/tidy php_tidy.h tidy.c
Log:
- MFH revert over constfying
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.17.2.8&r2=1.52.2.28.2.17.2.9&diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.8
php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.9
--- php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.8 Fri Jan 25 20:29:48 2008
+++ php-src/ext/spl/php_spl.c Sun Jan 27 15:04:41 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.52.2.28.2.17.2.8 2008/01/25 20:29:48 nlopess Exp $ */
+/* $Id: php_spl.c,v 1.52.2.28.2.17.2.9 2008/01/27 15:04:41 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -764,7 +764,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.17.2.1.2.3.2.3&r2=1.17.2.1.2.3.2.4&diff_format=u
Index: php-src/ext/spl/php_spl.h
diff -u php-src/ext/spl/php_spl.h:1.17.2.1.2.3.2.3
php-src/ext/spl/php_spl.h:1.17.2.1.2.3.2.4
--- php-src/ext/spl/php_spl.h:1.17.2.1.2.3.2.3 Fri Jan 25 20:29:48 2008
+++ php-src/ext/spl/php_spl.h Sun Jan 27 15:04:41 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.26.2.1.2.5.2.2&r2=1.26.2.1.2.5.2.3&diff_format=u
Index: php-src/ext/tidy/php_tidy.h
diff -u php-src/ext/tidy/php_tidy.h:1.26.2.1.2.5.2.2
php-src/ext/tidy/php_tidy.h:1.26.2.1.2.5.2.3
--- php-src/ext/tidy/php_tidy.h:1.26.2.1.2.5.2.2 Fri Jan 25 20:29:48 2008
+++ php-src/ext/tidy/php_tidy.h Sun Jan 27 15:04:41 2008
@@ -16,12 +16,12 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_tidy.h,v 1.26.2.1.2.5.2.2 2008/01/25 20:29:48 nlopess Exp $ */
+/* $Id: php_tidy.h,v 1.26.2.1.2.5.2.3 2008/01/27 15:04:41 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.66.2.8.2.24.2.4&r2=1.66.2.8.2.24.2.5&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.4
php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.5
--- php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.4 Fri Jan 25 20:29:48 2008
+++ php-src/ext/tidy/tidy.c Sun Jan 27 15:04:41 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.66.2.8.2.24.2.4 2008/01/25 20:29:48 nlopess Exp $ */
+/* $Id: tidy.c,v 1.66.2.8.2.24.2.5 2008/01/27 15:04:41 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -351,7 +351,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,
@@ -998,7 +998,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.66.2.8.2.24.2.4 2008/01/25 20:29:48
nlopess Exp $)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.24.2.5 2008/01/27 15:04:41
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
