- Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro

diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index 62eb172bcea0406c311c4644847f19fe1329a8f1..5718f1c72a00281ec63bd3b5ac3d15d6c2ea9224 100644 (file)
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -241,7 +241,6 @@ static void php_info_aolserver(ZEND_MODULE_INFO_FUNC_ARGS)
 PHP_FUNCTION(getallheaders);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_aolserver_getallheaders, 0)
 ZEND_END_ARG_INFO()
 /* }}} */

diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index 78ab895f9deed987e0049802bfdc046a549294fc..0c35a84d09869ae79977345563d851aec68ea3e2 100644 (file)
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -56,50 +56,40 @@ PHP_FUNCTION(apache_reset_timeout);
 
 PHP_MINFO_FUNCTION(apache);
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apache_child_terminate, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apache_note, 0, 0, 1)
        ZEND_ARG_INFO(0, note_name)
        ZEND_ARG_INFO(0, note_value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apache_virtual, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apache_request_headers, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apache_response_headers, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apache_setenv, 0, 0, 2)
        ZEND_ARG_INFO(0, variable)
        ZEND_ARG_INFO(0, value)
        ZEND_ARG_INFO(0, walk_to_top)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apache_lookup_uri, 0, 0, 1)
        ZEND_ARG_INFO(0, uri)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apache_get_version, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apache_get_modules, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apache_reset_timeout, 0)
 ZEND_END_ARG_INFO()
 

diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c
index 290e575f24aa1adc0448333a23c4bd00383d3e2d..d15935d6790e385729fa9136e0587991b83576ca 100644 (file)
--- a/sapi/apache2filter/php_functions.c
+++ b/sapi/apache2filter/php_functions.c
@@ -360,48 +360,39 @@ PHP_MINFO_FUNCTION(apache)
 }
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_lookup_uri, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_virtual, 0, 0, 1)
        ZEND_ARG_INFO(0, uri)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apache2filter_getallheaders, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apache2filter_response_headers, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_note, 0, 0, 1)
        ZEND_ARG_INFO(0, note_name)
        ZEND_ARG_INFO(0, note_value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_setenv, 0, 0, 2)
        ZEND_ARG_INFO(0, variable)
        ZEND_ARG_INFO(0, value)
        ZEND_ARG_INFO(0, walk_to_top)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_getenv, 0, 0, 1)
        ZEND_ARG_INFO(0, variable)
        ZEND_ARG_INFO(0, walk_to_top)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apache2filter_get_version, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apache2filter_get_modules, 0)
 ZEND_END_ARG_INFO()
 /* }}} */

diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 042a181cc6cf81bb9ebff7b74df7a952a77d8e10..d1719afd38865274d6edd498f433151ce1c0599d 100644 (file)
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -469,48 +469,39 @@ PHP_MINFO_FUNCTION(apache)
 }
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_lookup_uri, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_virtual, 0, 0, 1)
        ZEND_ARG_INFO(0, uri)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_response_headers, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_getallheaders, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_note, 0, 0, 1)
        ZEND_ARG_INFO(0, note_name)
        ZEND_ARG_INFO(0, note_value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_setenv, 0, 0, 2)
        ZEND_ARG_INFO(0, variable)
        ZEND_ARG_INFO(0, value)
        ZEND_ARG_INFO(0, walk_to_top)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_getenv, 0, 0, 1)
        ZEND_ARG_INFO(0, variable)
        ZEND_ARG_INFO(0, walk_to_top)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_get_version, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_get_modules, 0)
 ZEND_END_ARG_INFO()
 /* }}} */

diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c
index 2e43bf3058ca46651b5c77c5c8663cccfdd91a61..c554a75b728e310e84710628c640fea92157e596 100644 (file)
--- a/sapi/apache_hooks/php_apache.c
+++ b/sapi/apache_hooks/php_apache.c
@@ -59,48 +59,38 @@ PHP_FUNCTION(apache_get_modules);
 
 PHP_MINFO_FUNCTION(apache);
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apachehooks_virtual, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_request_headers, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_response_headers, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apachehooks_setenv, 0, 0, 2)
        ZEND_ARG_INFO(0, variable)
        ZEND_ARG_INFO(0, value)
        ZEND_ARG_INFO(0, walk_to_top)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apachehooks_lookup_uri, 0, 0, 1)
        ZEND_ARG_INFO(0, uri)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_get_version, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_get_modules, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_request_run, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_child_terminate, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_apachehooks_note, 0, 0, 1)
        ZEND_ARG_INFO(0, note_name)
        ZEND_ARG_INFO(0, note_value)

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 2af280984bb921bd0eadf0c99a081702ffc067bf..76b8a53abf6afc68cecfa5c0f4f2e66c2600635e 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -848,7 +848,6 @@ static sapi_module_struct cgi_sapi_module = {
 /* }}} */
 
 /* {{{ arginfo ext/standard/dl.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dl, 0)
        ZEND_ARG_INFO(0, extension_filename)
 ZEND_END_ARG_INFO()

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index a825fa16bb5274ac0bd34e4841bc679b01af06c3..5c0df125f1a273d3244c4344ec7b6604331f5f4d 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -434,7 +434,6 @@ static sapi_module_struct cli_sapi_module = {
 };
 /* }}} */
 /* {{{ arginfo ext/standard/dl.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dl, 0)
        ZEND_ARG_INFO(0, extension_filename)
 ZEND_END_ARG_INFO()

diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c
index 5c3bf1197cb8c3d08aeb555e8aa8c7154a400e4d..1a86113cc7085ed2db850eafe3e548babb3cdded 100644 (file)
--- a/sapi/embed/php_embed.c
+++ b/sapi/embed/php_embed.c
@@ -141,7 +141,6 @@ sapi_module_struct php_embed_module = {
 };
 /* }}} */
 /* {{{ arginfo ext/standard/dl.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dl, 0)
        ZEND_ARG_INFO(0, extension_filename)
 ZEND_END_ARG_INFO()

diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c
index 1741799f1ea44485f138ab637f3cf4624f03f03c..b4c4be5d81e5450cf278ec51fd8916818f8c1167 100644 (file)
--- a/sapi/milter/php_milter.c
+++ b/sapi/milter/php_milter.c
@@ -770,51 +770,42 @@ PHP_MINFO_FUNCTION(milter)
 /* }}} */
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_setflags, 0, 0, 1)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_settimeout, 0, 0, 1)
        ZEND_ARG_INFO(0, timeout)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_getsymval, 0, 0, 1)
        ZEND_ARG_INFO(0, macro)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_setreply, 0, 0, 3)
        ZEND_ARG_INFO(0, rcode)
        ZEND_ARG_INFO(0, xcode)
        ZEND_ARG_INFO(0, message)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_addheader, 0, 0, 2)
        ZEND_ARG_INFO(0, headerf)
        ZEND_ARG_INFO(0, headerv)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_chgheader, 0, 0, 2)
        ZEND_ARG_INFO(0, headerf)
        ZEND_ARG_INFO(0, headerv)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_addrcpt, 0, 0, 1)
        ZEND_ARG_INFO(0, rcpt)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_delrcpt, 0, 0, 1)
        ZEND_ARG_INFO(0, rcpt)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_replacebody, 0, 0, 1)
        ZEND_ARG_INFO(0, body)
 ZEND_END_ARG_INFO()

diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 7cb1781d9768ac72843af0d42db4181b10706034..e1d76d3ac6d88e5c5661d962de099540880ec729 100644 (file)
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -170,16 +170,13 @@ ZEND_DECLARE_MODULE_GLOBALS(nsapi)
 
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_nsapi_virtual, 0, 0, 1)
        ZEND_ARG_INFO(0, uri)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_nsapi_request_headers, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_nsapi_response_headers, 0)
 ZEND_END_ARG_INFO()
 /* }}} */