cvs: php-src(PHP_5_2) /main internal_functions.c.in internal_functions_nw.c internal_functions_win32.c php_logos.c php_logos.h

nlopess Sat Aug 12 19:33:54 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/main internal_functions.c.in internal_functions_nw.c internal_functions_win32.c php_logos.c php_logos.h Log: const/static keywording http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions.c.in?r1=1.30.2.1&r2=1.30.2.1.2.1&diff_format=u Index: php-src/main/internal_functions.c.in diff -u php-src/main/internal_functions.c.in:1.30.2.1 php-src/main/internal_functions.c.in:1.30.2.1.2.1 --- php-src/main/internal_functions.c.in:1.30.2.1 Sun Jan 1 12:50:17 2006 +++ php-src/main/internal_functions.c.in Sat Aug 12 19:33:54 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: internal_functions.c.in,v 1.30.2.1 2006/01/01 12:50:17 sniper Exp $ */ +/* $Id: internal_functions.c.in,v 1.30.2.1.2.1 2006/08/12 19:33:54 nlopess Exp $ */ #include "php.h" #include "php_main.h" @@ -29,7 +29,7 @@ @EXT_INCLUDE_CODE@ -zend_module_entry *php_builtin_extensions[] = { +static zend_module_entry *php_builtin_extensions[] = { @EXT_MODULE_PTRS@ }; http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions_nw.c?r1=1.9.2.1&r2=1.9.2.1.2.1&diff_format=u Index: php-src/main/internal_functions_nw.c diff -u php-src/main/internal_functions_nw.c:1.9.2.1 php-src/main/internal_functions_nw.c:1.9.2.1.2.1 --- php-src/main/internal_functions_nw.c:1.9.2.1 Sun Jan 1 12:50:17 2006 +++ php-src/main/internal_functions_nw.c Sat Aug 12 19:33:54 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: internal_functions_nw.c,v 1.9.2.1 2006/01/01 12:50:17 sniper Exp $ */ +/* $Id: internal_functions_nw.c,v 1.9.2.1.2.1 2006/08/12 19:33:54 nlopess Exp $ */ /* {{{ includes */ @@ -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, http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions_win32.c?r1=1.87.2.1.2.1&r2=1.87.2.1.2.2&diff_format=u Index: php-src/main/internal_functions_win32.c diff -u php-src/main/internal_functions_win32.c:1.87.2.1.2.1 php-src/main/internal_functions_win32.c:1.87.2.1.2.2 --- php-src/main/internal_functions_win32.c:1.87.2.1.2.1 Mon Jun 5 09:00:15 2006 +++ php-src/main/internal_functions_win32.c Sat Aug 12 19:33:54 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: internal_functions_win32.c,v 1.87.2.1.2.1 2006/06/05 09:00:15 stas Exp $ */ +/* $Id: internal_functions_win32.c,v 1.87.2.1.2.2 2006/08/12 19:33:54 nlopess Exp $ */ /* {{{ includes */ @@ -118,7 +118,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 http://cvs.php.net/viewvc.cgi/php-src/main/php_logos.c?r1=1.19.2.1.2.1&r2=1.19.2.1.2.2&diff_format=u Index: php-src/main/php_logos.c diff -u php-src/main/php_logos.c:1.19.2.1.2.1 php-src/main/php_logos.c:1.19.2.1.2.2 --- php-src/main/php_logos.c:1.19.2.1.2.1 Thu Jul 13 15:05:30 2006 +++ php-src/main/php_logos.c Sat Aug 12 19:33:54 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_logos.c,v 1.19.2.1.2.1 2006/07/13 15:05:30 iliaa Exp $ */ +/* $Id: php_logos.c,v 1.19.2.1.2.2 2006/08/12 19:33:54 nlopess Exp $ */ #include "php.h" #include "logos.h" @@ -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 @@ 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; http://cvs.php.net/viewvc.cgi/php-src/main/php_logos.h?r1=1.9.2.1.2.1&r2=1.9.2.1.2.2&diff_format=u Index: php-src/main/php_logos.h diff -u php-src/main/php_logos.h:1.9.2.1.2.1 php-src/main/php_logos.h:1.9.2.1.2.2 --- php-src/main/php_logos.h:1.9.2.1.2.1 Thu Jul 13 17:03:35 2006 +++ php-src/main/php_logos.h Sat Aug 12 19:33:54 2006 @@ -16,14 +16,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_logos.h,v 1.9.2.1.2.1 2006/07/13 17:03:35 tony2001 Exp $ */ +/* $Id: php_logos.h,v 1.9.2.1.2.2 2006/08/12 19:33:54 nlopess Exp $ */ #ifndef _PHP_LOGOS_H #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()