summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
Diffstat (limited to 'sapi')
-rw-r--r--sapi/aolserver/aolserver.c2
-rw-r--r--sapi/apache/php_apache.c2
-rw-r--r--sapi/apache2filter/php_functions.c2
-rw-r--r--sapi/apache2handler/php_functions.c2
-rw-r--r--sapi/apache_hooks/php_apache.c4
-rw-r--r--sapi/continuity/capi.c2
-rw-r--r--sapi/milter/php_milter.c2
-rw-r--r--sapi/nsapi/nsapi.c2
8 files changed, 9 insertions, 9 deletions
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index c04418aeb6..da289c99d1 100644
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -240,7 +240,7 @@ static void php_info_aolserver(ZEND_MODULE_INFO_FUNC_ARGS)
PHP_FUNCTION(getallheaders);
-static function_entry aolserver_functions[] = {
+static zend_function_entry aolserver_functions[] = {
PHP_FE(getallheaders, NULL)
{NULL, NULL, NULL}
};
diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index 787d09a057..cbc842fd9f 100644
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -51,7 +51,7 @@ PHP_FUNCTION(apache_reset_timeout);
PHP_MINFO_FUNCTION(apache);
-function_entry apache_functions[] = {
+zend_function_entry apache_functions[] = {
PHP_FE(virtual, NULL)
PHP_FE(apache_request_headers, NULL)
PHP_FE(apache_note, NULL)
diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c
index a8191d0fbd..4a2d81b1a6 100644
--- a/sapi/apache2filter/php_functions.c
+++ b/sapi/apache2filter/php_functions.c
@@ -355,7 +355,7 @@ PHP_MINFO_FUNCTION(apache)
php_info_print_table_end();
}
-static function_entry apache_functions[] = {
+static zend_function_entry apache_functions[] = {
PHP_FE(apache_lookup_uri, NULL)
PHP_FE(virtual, NULL)
PHP_FE(apache_request_headers, NULL)
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 302c7b7e77..7c286c605e 100644
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -462,7 +462,7 @@ PHP_MINFO_FUNCTION(apache)
}
}
-static function_entry apache_functions[] = {
+static zend_function_entry apache_functions[] = {
PHP_FE(apache_lookup_uri, NULL)
PHP_FE(virtual, NULL)
PHP_FE(apache_request_headers, NULL)
diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c
index 590707d4cc..eebea94b60 100644
--- a/sapi/apache_hooks/php_apache.c
+++ b/sapi/apache_hooks/php_apache.c
@@ -60,7 +60,7 @@ PHP_FUNCTION(apache_get_modules);
PHP_MINFO_FUNCTION(apache);
-function_entry apache_functions[] = {
+zend_function_entry apache_functions[] = {
PHP_FE(virtual, NULL)
PHP_FE(apache_request_headers, NULL)
PHP_FE(apache_note, NULL)
@@ -1286,7 +1286,7 @@ PHP_FUNCTION(apache_request_send_header_field)
/* {{{ php_apache_request_class_functions
*/
-static function_entry php_apache_request_class_functions[] = {
+static zend_function_entry php_apache_request_class_functions[] = {
/* string slots */
PHP_FALIAS(args, apache_request_args, NULL)
PHP_FALIAS(boundary, apache_request_boundary, NULL)
diff --git a/sapi/continuity/capi.c b/sapi/continuity/capi.c
index fb52acf3e6..4053292beb 100644
--- a/sapi/continuity/capi.c
+++ b/sapi/continuity/capi.c
@@ -80,7 +80,7 @@ PHP_FUNCTION(continuity_virtual);
PHP_FUNCTION(continuity_request_headers);
PHP_FUNCTION(continuity_response_headers);
-function_entry continuity_functions[] = {
+zend_function_entry continuity_functions[] = {
{NULL, NULL, NULL}
};
diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c
index a0fad53d8f..f9e18bbcb9 100644
--- a/sapi/milter/php_milter.c
+++ b/sapi/milter/php_milter.c
@@ -748,7 +748,7 @@ PHP_MINFO_FUNCTION(milter)
/* {{{ milter_functions[]
*/
-static function_entry milter_functions[] = {
+static zend_function_entry milter_functions[] = {
PHP_FE(smfi_setflags, NULL)
PHP_FE(smfi_settimeout, NULL)
PHP_FE(smfi_getsymval, NULL)
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 21e6ca7020..69eccdd15d 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -174,7 +174,7 @@ ZEND_DECLARE_MODULE_GLOBALS(nsapi)
*
* Every user visible function must have an entry in nsapi_functions[].
*/
-function_entry nsapi_functions[] = {
+zend_function_entry nsapi_functions[] = {
PHP_FE(nsapi_virtual, NULL) /* Make subrequest */
PHP_FALIAS(virtual, nsapi_virtual, NULL) /* compatibility */
PHP_FE(nsapi_request_headers, NULL) /* get request headers */