From: foobar <sniper@php.net>
Date: Tue, 6 Dec 2005 01:39:35 +0000 (+0000)
Subject: nuke php3 legacy
X-Git-Tag: RELEASE_1_1_1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0c7b984f0cdaf6b722cd0194e466d2771d3cd25;p=php

nuke php3 legacy
---

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 5a6e9de824..114271fbbb 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -31,7 +31,7 @@
 #include <unicode/udat.h>
 
 /* {{{ Function table */
-function_entry date_functions[] = {
+zend_function_entry date_functions[] = {
 	PHP_FE(strtotime, NULL)
 	PHP_FE(date, NULL)
 	PHP_FE(idate, NULL)
@@ -78,7 +78,7 @@ function_entry date_functions[] = {
 };
 
 
-function_entry date_funcs_date[] = {
+zend_function_entry date_funcs_date[] = {
 #ifdef EXPERIMENTAL_DATE_SUPPORT
 	ZEND_NAMED_FE(format, ZEND_FN(date_format), NULL)
 	ZEND_NAMED_FE(modify, ZEND_FN(date_modify), NULL)
@@ -92,7 +92,7 @@ function_entry date_funcs_date[] = {
 	{NULL, NULL, NULL}
 };
 
-function_entry date_funcs_timezone[] = {
+zend_function_entry date_funcs_timezone[] = {
 #ifdef EXPERIMENTAL_DATE_SUPPORT
 	ZEND_NAMED_FE(getName, ZEND_FN(timezone_name_get), NULL)
 	ZEND_NAMED_FE(getOffset, ZEND_FN(timezone_offset_get), NULL)
diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c
index 7bd2fa5939..e3284d8bbe 100644
--- a/ext/mysqli/mysqli_driver.c
+++ b/ext/mysqli/mysqli_driver.c
@@ -14,8 +14,10 @@
   +----------------------------------------------------------------------+
   | Author: Georg Richter <georg@php.net>                                |
   +----------------------------------------------------------------------+
-
 */
+
+/* $Id$ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -145,7 +147,7 @@ mysqli_property_entry mysqli_driver_property_entries[] = {
 
 /* {{{ mysqli_driver_methods[]
  */
-function_entry mysqli_driver_methods[] = {
+zend_function_entry mysqli_driver_methods[] = {
 	PHP_FALIAS(embedded_server_start, mysqli_embedded_server_start, NULL)
 	PHP_FALIAS(embedded_server_end, mysqli_embedded_server_end, NULL)
 	{NULL, NULL, NULL}
diff --git a/ext/mysqli/mysqli_exception.c b/ext/mysqli/mysqli_exception.c
index a65fd97eb6..1ae42c9bfb 100644
--- a/ext/mysqli/mysqli_exception.c
+++ b/ext/mysqli/mysqli_exception.c
@@ -30,7 +30,7 @@
 
 /* {{{ mysqli_exception_methods[]
  */
-function_entry mysqli_exception_methods[] = {
+zend_function_entry mysqli_exception_methods[] = {
 	{NULL, NULL, NULL}
 };
 /* }}} */
diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index 31993ca4ec..650af1e745 100644
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -50,7 +50,7 @@ static
  *
  * Every user visible function must have an entry in mysqli_functions[].
  */
-function_entry mysqli_functions[] = {
+zend_function_entry mysqli_functions[] = {
 	PHP_FE(mysqli_affected_rows,						NULL)
 	PHP_FE(mysqli_autocommit,							NULL)
 	PHP_FE(mysqli_change_user,							NULL)
@@ -183,7 +183,7 @@ function_entry mysqli_functions[] = {
  *
  * Every user visible function must have an entry in mysqli_functions[].
  */
-function_entry mysqli_link_methods[] = {
+zend_function_entry mysqli_link_methods[] = {
 	PHP_FALIAS(autocommit,mysqli_autocommit,NULL)
 	PHP_FALIAS(change_user,mysqli_change_user,NULL)
 	PHP_FALIAS(character_set_name, mysqli_character_set_name,NULL)
@@ -244,7 +244,7 @@ function_entry mysqli_link_methods[] = {
  *
  * Every user visible function must have an entry in mysqli_result_functions[].
  */
-function_entry mysqli_result_methods[] = {
+zend_function_entry mysqli_result_methods[] = {
 	PHP_FALIAS(close,mysqli_free_result,NULL)
 	PHP_FALIAS(free,mysqli_free_result,NULL)
 	PHP_FALIAS(data_seek,mysqli_data_seek,NULL)
@@ -266,7 +266,7 @@ function_entry mysqli_result_methods[] = {
  *
  * Every user visible function must have an entry in mysqli_stmt_functions[].
  */
-function_entry mysqli_stmt_methods[] = {
+zend_function_entry mysqli_stmt_methods[] = {
 	PHP_FALIAS(attr_get,mysqli_stmt_attr_get,NULL)
 	PHP_FALIAS(attr_set,mysqli_stmt_attr_set,NULL)
 	PHP_FALIAS(bind_param,mysqli_stmt_bind_param,second_arg_force_by_ref_rest)
diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c
index 19aa8eec8a..e9ae8fb263 100644
--- a/ext/mysqli/mysqli_warning.c
+++ b/ext/mysqli/mysqli_warning.c
@@ -211,7 +211,7 @@ PHP_METHOD(mysqli_warning, __construct)
 }
 /* }}} */
 
-function_entry mysqli_warning_methods[] = {
+zend_function_entry mysqli_warning_methods[] = {
 	PHP_ME(mysqli_warning, __construct,		NULL, ZEND_ACC_PROTECTED)
 	PHP_ME(mysqli_warning, next, 			NULL, ZEND_ACC_PUBLIC)
 	{NULL, NULL, NULL}
diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index a55df7f26e..63ed95374c 100644
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -121,13 +121,13 @@ typedef struct {
 #define PHP_MYSQLI_EXPORT(__type) PHP_MYSQLI_API __type
 
 extern zend_module_entry mysqli_module_entry;
-extern function_entry mysqli_functions[];
-extern function_entry mysqli_link_methods[];
-extern function_entry mysqli_stmt_methods[];
-extern function_entry mysqli_result_methods[];
-extern function_entry mysqli_driver_methods[];
-extern function_entry mysqli_warning_methods[];
-extern function_entry mysqli_exception_methods[];
+extern zend_function_entry mysqli_functions[];
+extern zend_function_entry mysqli_link_methods[];
+extern zend_function_entry mysqli_stmt_methods[];
+extern zend_function_entry mysqli_result_methods[];
+extern zend_function_entry mysqli_driver_methods[];
+extern zend_function_entry mysqli_warning_methods[];
+extern zend_function_entry mysqli_exception_methods[];
 
 extern mysqli_property_entry mysqli_link_property_entries[];
 extern mysqli_property_entry mysqli_result_property_entries[];