Skip to content

Commit 06b36f7

Browse files
author
foobar
committed
MFH: nuke php3 legacy
1 parent 253392f commit 06b36f7

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

ext/date/php_date.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <time.h>
3131

3232
/* {{{ Function table */
33-
function_entry date_functions[] = {
33+
zend_function_entry date_functions[] = {
3434
PHP_FE(strtotime, NULL)
3535
PHP_FE(date, NULL)
3636
PHP_FE(idate, NULL)
@@ -76,7 +76,7 @@ function_entry date_functions[] = {
7676
};
7777

7878
#ifdef EXPERIMENTAL_DATE_SUPPORT
79-
function_entry date_funcs_date[] = {
79+
zend_function_entry date_funcs_date[] = {
8080
ZEND_NAMED_FE(format, ZEND_FN(date_format), NULL)
8181
ZEND_NAMED_FE(modify, ZEND_FN(date_modify), NULL)
8282
ZEND_NAMED_FE(getTimezone, ZEND_FN(date_timezone_get), NULL)
@@ -88,7 +88,7 @@ function_entry date_funcs_date[] = {
8888
{NULL, NULL, NULL}
8989
};
9090

91-
function_entry date_funcs_timezone[] = {
91+
zend_function_entry date_funcs_timezone[] = {
9292
ZEND_NAMED_FE(getName, ZEND_FN(timezone_name_get), NULL)
9393
ZEND_NAMED_FE(getOffset, ZEND_FN(timezone_offset_get), NULL)
9494
ZEND_NAMED_FE(getTransistions, ZEND_FN(timezone_transistions_get), NULL)

ext/mysqli/mysqli_driver.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ mysqli_property_entry mysqli_driver_property_entries[] = {
145145

146146
/* {{{ mysqli_driver_methods[]
147147
*/
148-
function_entry mysqli_driver_methods[] = {
148+
zend_function_entry mysqli_driver_methods[] = {
149149
PHP_FALIAS(embedded_server_start, mysqli_embedded_server_start, NULL)
150150
PHP_FALIAS(embedded_server_end, mysqli_embedded_server_end, NULL)
151151
{NULL, NULL, NULL}

ext/mysqli/mysqli_exception.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
/* {{{ mysqli_exception_methods[]
3232
*/
33-
function_entry mysqli_exception_methods[] = {
33+
zend_function_entry mysqli_exception_methods[] = {
3434
{NULL, NULL, NULL}
3535
};
3636
/* }}} */

ext/mysqli/mysqli_fe.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static
5050
*
5151
* Every user visible function must have an entry in mysqli_functions[].
5252
*/
53-
function_entry mysqli_functions[] = {
53+
zend_function_entry mysqli_functions[] = {
5454
PHP_FE(mysqli_affected_rows, NULL)
5555
PHP_FE(mysqli_autocommit, NULL)
5656
PHP_FE(mysqli_change_user, NULL)
@@ -183,7 +183,7 @@ function_entry mysqli_functions[] = {
183183
*
184184
* Every user visible function must have an entry in mysqli_functions[].
185185
*/
186-
function_entry mysqli_link_methods[] = {
186+
zend_function_entry mysqli_link_methods[] = {
187187
PHP_FALIAS(autocommit,mysqli_autocommit,NULL)
188188
PHP_FALIAS(change_user,mysqli_change_user,NULL)
189189
PHP_FALIAS(character_set_name, mysqli_character_set_name,NULL)
@@ -244,7 +244,7 @@ function_entry mysqli_link_methods[] = {
244244
*
245245
* Every user visible function must have an entry in mysqli_result_functions[].
246246
*/
247-
function_entry mysqli_result_methods[] = {
247+
zend_function_entry mysqli_result_methods[] = {
248248
PHP_FALIAS(mysqli_result, mysqli_result_construct, NULL)
249249
PHP_FALIAS(close,mysqli_free_result,NULL)
250250
PHP_FALIAS(free,mysqli_free_result,NULL)
@@ -267,7 +267,7 @@ function_entry mysqli_result_methods[] = {
267267
*
268268
* Every user visible function must have an entry in mysqli_stmt_functions[].
269269
*/
270-
function_entry mysqli_stmt_methods[] = {
270+
zend_function_entry mysqli_stmt_methods[] = {
271271
PHP_FALIAS(mysqli_stmt, mysqli_stmt_construct, NULL)
272272
PHP_FALIAS(attr_get,mysqli_stmt_attr_get,NULL)
273273
PHP_FALIAS(attr_set,mysqli_stmt_attr_set,NULL)

ext/mysqli/mysqli_warning.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ PHP_METHOD(mysqli_warning, __construct)
211211
}
212212
/* }}} */
213213

214-
function_entry mysqli_warning_methods[] = {
214+
zend_function_entry mysqli_warning_methods[] = {
215215
PHP_ME(mysqli_warning, __construct, NULL, ZEND_ACC_PROTECTED)
216216
PHP_ME(mysqli_warning, next, NULL, ZEND_ACC_PUBLIC)
217217
{NULL, NULL, NULL}

ext/mysqli/php_mysqli.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,13 @@ typedef struct {
121121
#define PHP_MYSQLI_EXPORT(__type) PHP_MYSQLI_API __type
122122

123123
extern zend_module_entry mysqli_module_entry;
124-
extern function_entry mysqli_functions[];
125-
extern function_entry mysqli_link_methods[];
126-
extern function_entry mysqli_stmt_methods[];
127-
extern function_entry mysqli_result_methods[];
128-
extern function_entry mysqli_driver_methods[];
129-
extern function_entry mysqli_warning_methods[];
130-
extern function_entry mysqli_exception_methods[];
124+
extern zend_function_entry mysqli_functions[];
125+
extern zend_function_entry mysqli_link_methods[];
126+
extern zend_function_entry mysqli_stmt_methods[];
127+
extern zend_function_entry mysqli_result_methods[];
128+
extern zend_function_entry mysqli_driver_methods[];
129+
extern zend_function_entry mysqli_warning_methods[];
130+
extern zend_function_entry mysqli_exception_methods[];
131131

132132
extern mysqli_property_entry mysqli_link_property_entries[];
133133
extern mysqli_property_entry mysqli_result_property_entries[];

0 commit comments

Comments
 (0)