From: Nuno Lopes <nlopess@php.net>
Date: Mon, 14 Aug 2006 20:08:18 +0000 (+0000)
Subject: move static declaration to *.c files
X-Git-Tag: php-5.2.0RC2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ddb4d1fdcc2162edd7432080b117eaae6e24eb87;p=php

move static declaration to *.c files
mroe static/const keywording
---

diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
index 188024aa21..6cdefcac52 100644
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -40,6 +40,17 @@
 #define PHP_BZ_ERRSTR  1
 #define PHP_BZ_ERRBOTH 2
 
+static PHP_MINIT_FUNCTION(bz2);
+static PHP_MSHUTDOWN_FUNCTION(bz2);
+static PHP_MINFO_FUNCTION(bz2);
+static PHP_FUNCTION(bzopen);
+static PHP_FUNCTION(bzread);
+static PHP_FUNCTION(bzerrno);
+static PHP_FUNCTION(bzerrstr);
+static PHP_FUNCTION(bzerror);
+static PHP_FUNCTION(bzcompress);
+static PHP_FUNCTION(bzdecompress);
+
 /* {{{ arginfo */
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_bzread, 0, 0, 1)
diff --git a/ext/bz2/php_bz2.h b/ext/bz2/php_bz2.h
index ace76e0714..bb35c140c9 100644
--- a/ext/bz2/php_bz2.h
+++ b/ext/bz2/php_bz2.h
@@ -29,17 +29,6 @@ extern zend_module_entry bz2_module_entry;
 /* Bzip2 includes */
 #include <bzlib.h>
 
-static PHP_MINIT_FUNCTION(bz2);
-static PHP_MSHUTDOWN_FUNCTION(bz2);
-static PHP_MINFO_FUNCTION(bz2);
-static PHP_FUNCTION(bzopen);
-static PHP_FUNCTION(bzread);
-static PHP_FUNCTION(bzerrno);
-static PHP_FUNCTION(bzerrstr);
-static PHP_FUNCTION(bzerror);
-static PHP_FUNCTION(bzcompress);
-static PHP_FUNCTION(bzdecompress);
-
 #else
 #define phpext_bz2_ptr NULL
 #endif
diff --git a/ext/ctype/ctype.c b/ext/ctype/ctype.c
index cccfe9e101..d982dc5521 100644
--- a/ext/ctype/ctype.c
+++ b/ext/ctype/ctype.c
@@ -40,6 +40,24 @@ ZEND_DECLARE_MODULE_GLOBALS(ctype)
 /* True global resources - no need for thread safety here */
 /* static int le_ctype; */
 
+static PHP_MINIT_FUNCTION(ctype);
+static PHP_MSHUTDOWN_FUNCTION(ctype);
+static PHP_RINIT_FUNCTION(ctype);
+static PHP_RSHUTDOWN_FUNCTION(ctype);
+static PHP_MINFO_FUNCTION(ctype);
+
+static PHP_FUNCTION(ctype_alnum);
+static PHP_FUNCTION(ctype_alpha);
+static PHP_FUNCTION(ctype_cntrl);
+static PHP_FUNCTION(ctype_digit);
+static PHP_FUNCTION(ctype_lower);
+static PHP_FUNCTION(ctype_graph);
+static PHP_FUNCTION(ctype_print);
+static PHP_FUNCTION(ctype_punct);
+static PHP_FUNCTION(ctype_space);
+static PHP_FUNCTION(ctype_upper);
+static PHP_FUNCTION(ctype_xdigit);
+
 /* {{{ arginfo */
 static
 ZEND_BEGIN_ARG_INFO(arginfo_ctype_alnum, 0)
diff --git a/ext/ctype/php_ctype.h b/ext/ctype/php_ctype.h
index 622123879d..fe88279c47 100644
--- a/ext/ctype/php_ctype.h
+++ b/ext/ctype/php_ctype.h
@@ -33,24 +33,6 @@ extern zend_module_entry ctype_module_entry;
 #define PHP_CTYPE_API
 #endif
 
-static PHP_MINIT_FUNCTION(ctype);
-static PHP_MSHUTDOWN_FUNCTION(ctype);
-static PHP_RINIT_FUNCTION(ctype);
-static PHP_RSHUTDOWN_FUNCTION(ctype);
-static PHP_MINFO_FUNCTION(ctype);
-
-static PHP_FUNCTION(ctype_alnum);
-static PHP_FUNCTION(ctype_alpha);
-static PHP_FUNCTION(ctype_cntrl);
-static PHP_FUNCTION(ctype_digit);
-static PHP_FUNCTION(ctype_lower);
-static PHP_FUNCTION(ctype_graph);
-static PHP_FUNCTION(ctype_print);
-static PHP_FUNCTION(ctype_punct);
-static PHP_FUNCTION(ctype_space);
-static PHP_FUNCTION(ctype_upper);
-static PHP_FUNCTION(ctype_xdigit);
-
 /* 
   	Declare any global variables you may need between the BEGIN
 	and END macros here:     
diff --git a/ext/json/json.c b/ext/json/json.c
index cbd5d3deb6..df02927d0a 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -30,6 +30,11 @@
 #include "JSON_parser.h"
 #include "php_json.h"
 
+static PHP_MINFO_FUNCTION(json);
+
+static PHP_FUNCTION(json_encode);
+static PHP_FUNCTION(json_decode);
+
 /* If you declare any globals in php_json.h uncomment this:
 ZEND_DECLARE_MODULE_GLOBALS(json)
 */
@@ -39,7 +44,7 @@ static const char digits[] = "0123456789abcdef";
  *
  * Every user visible function must have an entry in json_functions[].
  */
-function_entry json_functions[] = {
+static function_entry json_functions[] = {
     PHP_FE(json_encode, NULL)
     PHP_FE(json_decode, NULL)
     {NULL, NULL, NULL}  /* Must be the last line in json_functions[] */
@@ -72,7 +77,7 @@ ZEND_GET_MODULE(json)
 
 /* {{{ PHP_MINFO_FUNCTION
  */
-PHP_MINFO_FUNCTION(json)
+static PHP_MINFO_FUNCTION(json)
 {
     php_info_print_table_start();
     php_info_print_table_row(2, "json support", "enabled");
@@ -390,7 +395,7 @@ static void json_encode_r(smart_str *buf, zval *val TSRMLS_DC) {
     return;
 }
 
-PHP_FUNCTION(json_encode)
+static PHP_FUNCTION(json_encode)
 {
     zval *parameter;
     smart_str buf = {0};
@@ -406,7 +411,7 @@ PHP_FUNCTION(json_encode)
     smart_str_free(&buf);
 }
 
-PHP_FUNCTION(json_decode)
+static PHP_FUNCTION(json_decode)
 {
     char *parameter;
     int parameter_len, utf16_len;
diff --git a/ext/json/php_json.h b/ext/json/php_json.h
index 48555ee31f..98eac25938 100644
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -36,11 +36,6 @@ extern zend_module_entry json_module_entry;
 #include "TSRM.h"
 #endif
 
-PHP_MINFO_FUNCTION(json);
-
-PHP_FUNCTION(json_encode);
-PHP_FUNCTION(json_decode);
-
 #ifdef ZTS
 #define JSON_G(v) TSRMG(json_globals_id, zend_json_globals *, v)
 #else
diff --git a/ext/pspell/php_pspell.h b/ext/pspell/php_pspell.h
index 5fb8447bbe..70d3ac0188 100644
--- a/ext/pspell/php_pspell.h
+++ b/ext/pspell/php_pspell.h
@@ -23,28 +23,6 @@
 #if HAVE_PSPELL
 extern zend_module_entry pspell_module_entry;
 #define pspell_module_ptr &pspell_module_entry
-
-static PHP_MINIT_FUNCTION(pspell);
-static PHP_MINFO_FUNCTION(pspell);
-static PHP_FUNCTION(pspell_new);
-static PHP_FUNCTION(pspell_new_personal);
-static PHP_FUNCTION(pspell_new_config);
-static PHP_FUNCTION(pspell_check);
-static PHP_FUNCTION(pspell_suggest);
-static PHP_FUNCTION(pspell_store_replacement);
-static PHP_FUNCTION(pspell_add_to_personal);
-static PHP_FUNCTION(pspell_add_to_session);
-static PHP_FUNCTION(pspell_clear_session);
-static PHP_FUNCTION(pspell_save_wordlist);
-static PHP_FUNCTION(pspell_config_create);
-static PHP_FUNCTION(pspell_config_runtogether);
-static PHP_FUNCTION(pspell_config_mode);
-static PHP_FUNCTION(pspell_config_ignore);
-static PHP_FUNCTION(pspell_config_personal);
-static PHP_FUNCTION(pspell_config_dict_dir);
-static PHP_FUNCTION(pspell_config_data_dir);
-static PHP_FUNCTION(pspell_config_repl);
-static PHP_FUNCTION(pspell_config_save_repl);
 #else
 #define pspell_module_ptr NULL
 #endif
diff --git a/ext/pspell/pspell.c b/ext/pspell/pspell.c
index a0ddad4034..be4076fc3a 100644
--- a/ext/pspell/pspell.c
+++ b/ext/pspell/pspell.c
@@ -50,9 +50,31 @@
  */
 #define PSPELL_LARGEST_WORD 3
 
+static PHP_MINIT_FUNCTION(pspell);
+static PHP_MINFO_FUNCTION(pspell);
+static PHP_FUNCTION(pspell_new);
+static PHP_FUNCTION(pspell_new_personal);
+static PHP_FUNCTION(pspell_new_config);
+static PHP_FUNCTION(pspell_check);
+static PHP_FUNCTION(pspell_suggest);
+static PHP_FUNCTION(pspell_store_replacement);
+static PHP_FUNCTION(pspell_add_to_personal);
+static PHP_FUNCTION(pspell_add_to_session);
+static PHP_FUNCTION(pspell_clear_session);
+static PHP_FUNCTION(pspell_save_wordlist);
+static PHP_FUNCTION(pspell_config_create);
+static PHP_FUNCTION(pspell_config_runtogether);
+static PHP_FUNCTION(pspell_config_mode);
+static PHP_FUNCTION(pspell_config_ignore);
+static PHP_FUNCTION(pspell_config_personal);
+static PHP_FUNCTION(pspell_config_dict_dir);
+static PHP_FUNCTION(pspell_config_data_dir);
+static PHP_FUNCTION(pspell_config_repl);
+static PHP_FUNCTION(pspell_config_save_repl);
+
 /* {{{ pspell_functions[]
  */
-zend_function_entry pspell_functions[] = {
+static zend_function_entry pspell_functions[] = {
 	PHP_FE(pspell_new,		NULL)
 	PHP_FE(pspell_new_personal,		NULL)
 	PHP_FE(pspell_new_config,		NULL)
diff --git a/ext/tidy/php_tidy.h b/ext/tidy/php_tidy.h
index b0754cccb5..dd1aa7b31a 100644
--- a/ext/tidy/php_tidy.h
+++ b/ext/tidy/php_tidy.h
@@ -39,58 +39,6 @@ extern zend_module_entry tidy_module_entry;
 #define TIDY_ATTR_METHOD(name)    PHP_FUNCTION(tam_ ##name)
 #define TIDY_ATTR_ME(name, param) TIDY_METHOD_MAP(name, tam_ ##name, param)
 
-static PHP_MINIT_FUNCTION(tidy);
-static PHP_MSHUTDOWN_FUNCTION(tidy);
-static PHP_RINIT_FUNCTION(tidy);
-static PHP_MINFO_FUNCTION(tidy);
-
-static PHP_FUNCTION(tidy_getopt);
-static PHP_FUNCTION(tidy_parse_string);
-static PHP_FUNCTION(tidy_parse_file);
-static PHP_FUNCTION(tidy_clean_repair);
-static PHP_FUNCTION(tidy_repair_string);
-static PHP_FUNCTION(tidy_repair_file);
-static PHP_FUNCTION(tidy_diagnose);
-static PHP_FUNCTION(tidy_get_output);
-static PHP_FUNCTION(tidy_get_error_buffer);
-static PHP_FUNCTION(tidy_get_release);
-static PHP_FUNCTION(tidy_reset_config);
-static PHP_FUNCTION(tidy_get_config);
-static PHP_FUNCTION(tidy_get_status);
-static PHP_FUNCTION(tidy_get_html_ver);
-#if HAVE_TIDYOPTGETDOC
-static PHP_FUNCTION(tidy_get_opt_doc);
-#endif
-static PHP_FUNCTION(tidy_is_xhtml);
-static PHP_FUNCTION(tidy_is_xml);
-static PHP_FUNCTION(tidy_error_count);
-static PHP_FUNCTION(tidy_warning_count);
-static PHP_FUNCTION(tidy_access_count);
-static PHP_FUNCTION(tidy_config_count);
-
-static PHP_FUNCTION(ob_tidyhandler);
-
-static PHP_FUNCTION(tidy_get_root);
-static PHP_FUNCTION(tidy_get_html);
-static PHP_FUNCTION(tidy_get_head);
-static PHP_FUNCTION(tidy_get_body);
-
-static TIDY_DOC_METHOD(__construct);
-static TIDY_DOC_METHOD(parseFile);
-static TIDY_DOC_METHOD(parseString);
-
-static TIDY_NODE_METHOD(__construct);
-static TIDY_NODE_METHOD(hasChildren);
-static TIDY_NODE_METHOD(hasSiblings);
-static TIDY_NODE_METHOD(isComment);
-static TIDY_NODE_METHOD(isHtml);
-static TIDY_NODE_METHOD(isXhtml);
-static TIDY_NODE_METHOD(isXml);
-static TIDY_NODE_METHOD(isText);
-static TIDY_NODE_METHOD(isJste);
-static TIDY_NODE_METHOD(isAsp);
-static TIDY_NODE_METHOD(isPhp);
-
 ZEND_BEGIN_MODULE_GLOBALS(tidy)
 	char *default_config;
     zval *inst;
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 23d1222a5a..7057a56899 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -237,6 +237,58 @@ static int _php_tidy_set_tidy_opt(TidyDoc, char *, zval * TSRMLS_DC);
 static int _php_tidy_apply_config_array(TidyDoc doc, HashTable *ht_options TSRMLS_DC);
 static void _php_tidy_register_nodetypes(INIT_FUNC_ARGS);
 static void _php_tidy_register_tags(INIT_FUNC_ARGS);
+
+static PHP_MINIT_FUNCTION(tidy);
+static PHP_MSHUTDOWN_FUNCTION(tidy);
+static PHP_RINIT_FUNCTION(tidy);
+static PHP_MINFO_FUNCTION(tidy);
+
+static PHP_FUNCTION(tidy_getopt);
+static PHP_FUNCTION(tidy_parse_string);
+static PHP_FUNCTION(tidy_parse_file);
+static PHP_FUNCTION(tidy_clean_repair);
+static PHP_FUNCTION(tidy_repair_string);
+static PHP_FUNCTION(tidy_repair_file);
+static PHP_FUNCTION(tidy_diagnose);
+static PHP_FUNCTION(tidy_get_output);
+static PHP_FUNCTION(tidy_get_error_buffer);
+static PHP_FUNCTION(tidy_get_release);
+static PHP_FUNCTION(tidy_reset_config);
+static PHP_FUNCTION(tidy_get_config);
+static PHP_FUNCTION(tidy_get_status);
+static PHP_FUNCTION(tidy_get_html_ver);
+#if HAVE_TIDYOPTGETDOC
+static PHP_FUNCTION(tidy_get_opt_doc);
+#endif
+static PHP_FUNCTION(tidy_is_xhtml);
+static PHP_FUNCTION(tidy_is_xml);
+static PHP_FUNCTION(tidy_error_count);
+static PHP_FUNCTION(tidy_warning_count);
+static PHP_FUNCTION(tidy_access_count);
+static PHP_FUNCTION(tidy_config_count);
+
+static PHP_FUNCTION(ob_tidyhandler);
+
+static PHP_FUNCTION(tidy_get_root);
+static PHP_FUNCTION(tidy_get_html);
+static PHP_FUNCTION(tidy_get_head);
+static PHP_FUNCTION(tidy_get_body);
+
+static TIDY_DOC_METHOD(__construct);
+static TIDY_DOC_METHOD(parseFile);
+static TIDY_DOC_METHOD(parseString);
+
+static TIDY_NODE_METHOD(__construct);
+static TIDY_NODE_METHOD(hasChildren);
+static TIDY_NODE_METHOD(hasSiblings);
+static TIDY_NODE_METHOD(isComment);
+static TIDY_NODE_METHOD(isHtml);
+static TIDY_NODE_METHOD(isXhtml);
+static TIDY_NODE_METHOD(isXml);
+static TIDY_NODE_METHOD(isText);
+static TIDY_NODE_METHOD(isJste);
+static TIDY_NODE_METHOD(isAsp);
+static TIDY_NODE_METHOD(isPhp);
 /* }}} */
 
 ZEND_DECLARE_MODULE_GLOBALS(tidy)
diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h
index 1e9c0b5cff..44610dc979 100644
--- a/ext/zlib/php_zlib.h
+++ b/ext/zlib/php_zlib.h
@@ -39,26 +39,9 @@ extern php_stream_filter_factory php_zlib_filter_factory;
 extern zend_module_entry php_zlib_module_entry;
 #define zlib_module_ptr &php_zlib_module_entry
 
-PHP_MINIT_FUNCTION(zlib);
-PHP_MSHUTDOWN_FUNCTION(zlib);
-PHP_RINIT_FUNCTION(zlib);
-PHP_MINFO_FUNCTION(zlib);
-PHP_FUNCTION(gzopen);
-PHP_FUNCTION(readgzfile);
-PHP_FUNCTION(gzfile);
-PHP_FUNCTION(gzcompress);
-PHP_FUNCTION(gzuncompress);
-PHP_FUNCTION(gzdeflate);
-PHP_FUNCTION(gzinflate);
-PHP_FUNCTION(gzencode);
-PHP_FUNCTION(ob_gzhandler);
-PHP_FUNCTION(zlib_get_coding_type);
-
-int php_enable_output_compression(int buffer_size TSRMLS_DC);
 int php_ob_gzhandler_check(TSRMLS_D);
 
 php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC);
-extern php_stream_ops php_stream_gzio_ops;
 extern php_stream_wrapper php_stream_gzip_wrapper;
 
 #ifdef ZTS
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index e9bea6cf0f..21d9034192 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -82,11 +82,28 @@
 #define GZIP_FOOTER_LENGTH		8
 
 /* True globals, no need for thread safety */
-static int gz_magic[2] = {0x1f, 0x8b};	/* gzip magic header */
+static const int gz_magic[2] = {0x1f, 0x8b};	/* gzip magic header */
+
+static int php_enable_output_compression(int buffer_size TSRMLS_DC);
+
+static PHP_MINIT_FUNCTION(zlib);
+static PHP_MSHUTDOWN_FUNCTION(zlib);
+static PHP_RINIT_FUNCTION(zlib);
+static PHP_MINFO_FUNCTION(zlib);
+static PHP_FUNCTION(gzopen);
+static PHP_FUNCTION(readgzfile);
+static PHP_FUNCTION(gzfile);
+static PHP_FUNCTION(gzcompress);
+static PHP_FUNCTION(gzuncompress);
+static PHP_FUNCTION(gzdeflate);
+static PHP_FUNCTION(gzinflate);
+static PHP_FUNCTION(gzencode);
+static PHP_FUNCTION(ob_gzhandler);
+static PHP_FUNCTION(zlib_get_coding_type);
 
 /* {{{ php_zlib_functions[]
  */
-zend_function_entry php_zlib_functions[] = {
+static zend_function_entry php_zlib_functions[] = {
 	PHP_FE(readgzfile,						NULL)
 	PHP_FALIAS(gzrewind,	rewind,			NULL)
 	PHP_FALIAS(gzclose,		fclose,			NULL)
@@ -205,7 +222,7 @@ PHP_INI_END()
 
 /* {{{ PHP_MINIT_FUNCTION
  */
-PHP_MINIT_FUNCTION(zlib)
+static PHP_MINIT_FUNCTION(zlib)
 {
 	php_register_url_stream_wrapper("compress.zlib", &php_stream_gzip_wrapper TSRMLS_CC);
 	php_stream_filter_register_factory("zlib.*", &php_zlib_filter_factory TSRMLS_CC);
@@ -221,7 +238,7 @@ PHP_MINIT_FUNCTION(zlib)
 
 /* {{{ PHP_RINIT_FUNCTION
  */
-PHP_RINIT_FUNCTION(zlib)
+static PHP_RINIT_FUNCTION(zlib)
 {
 	uint chunk_size = ZLIBG(output_compression);
 
@@ -240,7 +257,7 @@ PHP_RINIT_FUNCTION(zlib)
 
 /* {{{ PHP_MSHUTDOWN_FUNCTION
  */
-PHP_MSHUTDOWN_FUNCTION(zlib)
+static PHP_MSHUTDOWN_FUNCTION(zlib)
 {
 	php_unregister_url_stream_wrapper("zlib" TSRMLS_CC);
 	php_stream_filter_unregister_factory("zlib.*" TSRMLS_CC);
@@ -253,7 +270,7 @@ PHP_MSHUTDOWN_FUNCTION(zlib)
 
 /* {{{ PHP_MINFO_FUNCTION
  */
-PHP_MINFO_FUNCTION(zlib)
+static PHP_MINFO_FUNCTION(zlib)
 {
 	php_info_print_table_start();
 	php_info_print_table_row(2, "ZLib Support", "enabled");
@@ -269,7 +286,7 @@ PHP_MINFO_FUNCTION(zlib)
 
 /* {{{ proto array gzfile(string filename [, int use_include_path])
    Read und uncompress entire .gz-file into an array */
-PHP_FUNCTION(gzfile)
+static PHP_FUNCTION(gzfile)
 {
 	char *filename;
 	int filename_len;
@@ -314,7 +331,7 @@ PHP_FUNCTION(gzfile)
 
 /* {{{ proto resource gzopen(string filename, string mode [, int use_include_path])
    Open a .gz-file and return a .gz-file pointer */
-PHP_FUNCTION(gzopen)
+static PHP_FUNCTION(gzopen)
 {
 	char *filename, *mode;
 	int filename_len, mode_len;
@@ -342,7 +359,7 @@ PHP_FUNCTION(gzopen)
  */
 /* {{{ proto int readgzfile(string filename [, int use_include_path])
    Output a .gz-file */
-PHP_FUNCTION(readgzfile)
+static PHP_FUNCTION(readgzfile)
 {
 	char *filename;
 	int filename_len;
@@ -369,7 +386,7 @@ PHP_FUNCTION(readgzfile)
 
 /* {{{ proto string gzcompress(string data [, int level]) 
    Gzip-compress a string */
-PHP_FUNCTION(gzcompress)
+static PHP_FUNCTION(gzcompress)
 {
 	int data_len, status;
 	long level = Z_DEFAULT_COMPRESSION;
@@ -411,7 +428,7 @@ PHP_FUNCTION(gzcompress)
 
 /* {{{ proto string gzuncompress(string data [, int length]) 
    Unzip a gzip-compressed string */
-PHP_FUNCTION(gzuncompress)
+static PHP_FUNCTION(gzuncompress)
 {
 	int data_len, status;
 	unsigned int factor=1, maxfactor=16;
@@ -457,7 +474,7 @@ PHP_FUNCTION(gzuncompress)
 
 /* {{{ proto string gzdeflate(string data [, int level]) 
    Gzip-compress a string */
-PHP_FUNCTION(gzdeflate)
+static PHP_FUNCTION(gzdeflate)
 {
 	int data_len,status;
 	long level = Z_DEFAULT_COMPRESSION;
@@ -518,7 +535,7 @@ PHP_FUNCTION(gzdeflate)
 
 /* {{{ proto string gzinflate(string data [, int length]) 
    Unzip a gzip-compressed string */
-PHP_FUNCTION(gzinflate)
+static PHP_FUNCTION(gzinflate)
 {
 	int data_len, status;
 	unsigned int factor=1, maxfactor=16;
@@ -598,7 +615,7 @@ PHP_FUNCTION(gzinflate)
 
 /* {{{ proto string zlib_get_coding_type(void)
    Returns the coding type used for output compression */
-PHP_FUNCTION(zlib_get_coding_type)
+static PHP_FUNCTION(zlib_get_coding_type)
 {
 	switch (ZLIBG(compression_coding)) {
 		case CODING_GZIP:
@@ -732,7 +749,7 @@ static int php_deflate_string(const char *str, uint str_length, char **newstr, u
 
 /* {{{ proto string gzencode(string data [, int level [, int encoding_mode]])
    GZ encode a string */
-PHP_FUNCTION(gzencode)
+static PHP_FUNCTION(gzencode)
 {
 	char *data, *s2;
 	int data_len;
@@ -862,7 +879,7 @@ int php_ob_gzhandler_check(TSRMLS_D)
 
 /* {{{ proto string ob_gzhandler(string str, int mode)
    Encode str based on accept-encoding setting - designed to be called from ob_start() */
-PHP_FUNCTION(ob_gzhandler)
+static PHP_FUNCTION(ob_gzhandler)
 {
 	char *string;
 	int string_len;
@@ -963,7 +980,7 @@ static void php_gzip_output_handler(char *output, uint output_len, char **handle
 
 /* {{{ php_enable_output_compression
  */
-int php_enable_output_compression(int buffer_size TSRMLS_DC)
+static int php_enable_output_compression(int buffer_size TSRMLS_DC)
 {
 	zval **a_encoding;
 
diff --git a/ext/zlib/zlib_fopen_wrapper.c b/ext/zlib/zlib_fopen_wrapper.c
index a7718a9b02..631db81819 100644
--- a/ext/zlib/zlib_fopen_wrapper.c
+++ b/ext/zlib/zlib_fopen_wrapper.c
@@ -92,7 +92,7 @@ static int php_gziop_flush(php_stream *stream TSRMLS_DC)
 	return gzflush(self->gz_file, Z_SYNC_FLUSH);
 }
 
-php_stream_ops php_stream_gzio_ops = {
+static php_stream_ops php_stream_gzio_ops = {
 	php_gziop_write, php_gziop_read,
 	php_gziop_close, php_gziop_flush,
 	"ZLIB",