MFB: const keywording

diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index 04131b4a35a83c51e2f3113c7a758cc0dee9ebac..73119dcd00844457d1e257ac3101aebc3a8f6ec6 100755 (executable)
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -46,13 +46,6 @@ ZEND_GET_MODULE(spl)
 
 ZEND_DECLARE_MODULE_GLOBALS(spl)
 
-/* {{{ spl_functions_none
- */
-const zend_function_entry spl_functions_none[] = {
-       {NULL, NULL, NULL}
-};
-/* }}} */
-
 /* {{{ PHP_GINIT_FUNCTION
  */
 static PHP_GINIT_FUNCTION(spl)
@@ -788,7 +781,7 @@ static const zend_module_dep spl_deps[] = {
 
 /* {{{ spl_module_entry
  */
-zend_module_entry spl_module_entry = {
+const zend_module_entry spl_module_entry = {
 #ifdef HAVE_SIMPLEXML
        STANDARD_MODULE_HEADER_EX, NULL,
        spl_deps,

diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h
index 1c202747ecc888e31c49f1acca05242a2137765e..fed15767fbd0155a6514a63a96416f00642b8a55 100755 (executable)
--- a/ext/spl/php_spl.h
+++ b/ext/spl/php_spl.h
@@ -28,7 +28,7 @@
 #define SPL_DEBUG(x)
 #endif
 
-extern zend_module_entry spl_module_entry;
+extern const zend_module_entry spl_module_entry;
 #define phpext_spl_ptr &spl_module_entry
 
 #ifdef PHP_WIN32

diff --git a/ext/tidy/php_tidy.h b/ext/tidy/php_tidy.h
index b3aaca3db9ce9effc8210f2f41ff7f7951b07df9..71a53f1babae67de974214a8d539aeea1fd1d28c 100644 (file)
--- a/ext/tidy/php_tidy.h
+++ b/ext/tidy/php_tidy.h
@@ -21,7 +21,7 @@
 #ifndef PHP_TIDY_H
 #define PHP_TIDY_H
 
-extern zend_module_entry tidy_module_entry;
+extern const zend_module_entry tidy_module_entry;
 #define phpext_tidy_ptr &tidy_module_entry
 
 #define TIDY_METHOD_MAP(name, func_name, arg_types) \

diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 0737819eac8abfc3fea1b58b655f14227d400071..99c6a0bf21b7a328a12d3ef5a75b6d096eebf1ad 100644 (file)
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -359,7 +359,7 @@ static zend_class_entry *tidy_ce_doc, *tidy_ce_node;
 static zend_object_handlers tidy_object_handlers_doc;
 static zend_object_handlers tidy_object_handlers_node;
 
-zend_module_entry tidy_module_entry = {
+const zend_module_entry tidy_module_entry = {
        STANDARD_MODULE_HEADER,
        "tidy",
        tidy_functions,