MFH: const/static keywording

diff --git a/main/internal_functions.c.in b/main/internal_functions.c.in
index 3c5d1a95b98bfbcac863ac5cae012acf0c251b4b..36e24d24752427ab402cde5669ebcbf47285d31c 100644 (file)
--- a/main/internal_functions.c.in
+++ b/main/internal_functions.c.in
@@ -29,7 +29,7 @@
 
 @EXT_INCLUDE_CODE@
 
-zend_module_entry *php_builtin_extensions[] = {
+static zend_module_entry *php_builtin_extensions[] = {
 @EXT_MODULE_PTRS@
 };
 

diff --git a/main/internal_functions_nw.c b/main/internal_functions_nw.c
index 912e9bf39754682ccdd0eacef93fa36c89ac246b..a79ad6595a5d9f695d2e954dc4d2bcd8952b3090 100644 (file)
--- a/main/internal_functions_nw.c
+++ b/main/internal_functions_nw.c
@@ -62,7 +62,7 @@
 
 /* {{{ php_builtin_extensions[]
  */
-zend_module_entry *php_builtin_extensions[] = {
+static zend_module_entry *php_builtin_extensions[] = {
        phpext_standard_ptr,
 #if HAVE_BCMATH
        phpext_bcmath_ptr,

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index 6edde1ea4db488eb16aa8526335ed0a857d0c06d..78f67da0c023aaec879e318c3e64e857e8d830f3 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -102,7 +102,7 @@
 
 /* {{{ php_builtin_extensions[]
  */
-zend_module_entry *php_builtin_extensions[] = {
+static zend_module_entry *php_builtin_extensions[] = {
        phpext_standard_ptr
 #if HAVE_BCMATH
        ,phpext_bcmath_ptr

diff --git a/main/php_logos.c b/main/php_logos.c
index 3bbcca5bb73c7257b665340a391f75389c285933..6f892a417df2a361d2a3276f4ccd1b8ea3d33776 100644 (file)
--- a/main/php_logos.c
+++ b/main/php_logos.c
@@ -25,7 +25,7 @@
 #include "SAPI.h"
 
 typedef struct _php_info_logo { 
-       char *mimetype;
+       const char *mimetype;
        int mimelen;
        const unsigned char *data; 
        int size; 
@@ -33,7 +33,7 @@ typedef struct _php_info_logo {
 
 HashTable phpinfo_logo_hash;
 
-PHPAPI int php_register_info_logo(char *logo_string, char *mimetype, const unsigned char *data, int size)
+PHPAPI int php_register_info_logo(char *logo_string, const char *mimetype, const unsigned char *data, int size)
 {
        php_info_logo info_logo;
 

diff --git a/main/php_logos.h b/main/php_logos.h
index e8aafcefc4adb3184e722fb9807a6f395265d6a2..f08f28e0882dcb0c4753613d30630e4437278b55 100644 (file)
--- a/main/php_logos.h
+++ b/main/php_logos.h
@@ -23,7 +23,7 @@
 #define _PHP_LOGOS_H
 
 BEGIN_EXTERN_C()
-PHPAPI int php_register_info_logo(char *logo_string, char *mimetype, const unsigned char *data, int size);
+PHPAPI int php_register_info_logo(char *logo_string, const char *mimetype, const unsigned char *data, int size);
 PHPAPI int php_unregister_info_logo(char *logo_string);
 END_EXTERN_C()