summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Zend/zend_API.c4
-rwxr-xr-xext/intl/collator/collator_class.c2
-rwxr-xr-xext/intl/dateformat/dateformat_class.c2
-rwxr-xr-xext/intl/formatter/formatter_class.c2
-rwxr-xr-xext/intl/locale/locale_class.c2
-rwxr-xr-xext/intl/msgformat/msgformat_class.c2
-rwxr-xr-xext/intl/normalizer/normalizer_class.c2
-rw-r--r--ext/intl/resourcebundle/resourcebundle_class.c2
-rwxr-xr-xext/intl/spoofchecker/spoofchecker_class.c2
-rw-r--r--ext/intl/transliterator/transliterator_class.c2
-rw-r--r--ext/json/json.c2
-rw-r--r--ext/standard/user_filters.c2
-rw-r--r--sapi/apache_hooks/php_apache.c2
-rw-r--r--sapi/milter/php_milter.c2
14 files changed, 15 insertions, 15 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index fa9d8a0686..fb49767e03 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2505,7 +2505,7 @@ ZEND_API ZEND_FUNCTION(display_disabled_function)
static zend_function_entry disabled_function[] = {
ZEND_FE(display_disabled_function, NULL)
- { NULL, NULL, NULL }
+ ZEND_FE_END
};
ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC) /* {{{ */
@@ -2529,7 +2529,7 @@ static zend_object_value display_disabled_class(zend_class_entry *class_type TSR
/* }}} */
static const zend_function_entry disabled_class_new[] = {
- { NULL, NULL, NULL }
+ ZEND_FE_END
};
ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_DC) /* {{{ */
diff --git a/ext/intl/collator/collator_class.c b/ext/intl/collator/collator_class.c
index 4f11aff86f..de744dcefe 100755
--- a/ext/intl/collator/collator_class.c
+++ b/ext/intl/collator/collator_class.c
@@ -127,7 +127,7 @@ zend_function_entry Collator_class_functions[] = {
PHP_NAMED_FE( getErrorCode, ZEND_FN( collator_get_error_code ), collator_0_args )
PHP_NAMED_FE( getErrorMessage, ZEND_FN( collator_get_error_message ), collator_0_args )
PHP_NAMED_FE( getSortKey, ZEND_FN( collator_get_sort_key ), collator_2_args )
- { NULL, NULL, NULL }
+ PHP_FE_END
};
/* }}} */
diff --git a/ext/intl/dateformat/dateformat_class.c b/ext/intl/dateformat/dateformat_class.c
index 674e219d0b..c66610f23b 100755
--- a/ext/intl/dateformat/dateformat_class.c
+++ b/ext/intl/dateformat/dateformat_class.c
@@ -170,7 +170,7 @@ static zend_function_entry IntlDateFormatter_class_functions[] = {
PHP_NAMED_FE( localtime, ZEND_FN( datefmt_localtime ), datefmt_parse_args )
PHP_NAMED_FE( getErrorCode, ZEND_FN( datefmt_get_error_code ), arginfo_intldateformatter_getdatetype )
PHP_NAMED_FE( getErrorMessage, ZEND_FN( datefmt_get_error_message ), arginfo_intldateformatter_getdatetype )
- { NULL, NULL, NULL }
+ PHP_FE_END
};
/* }}} */
diff --git a/ext/intl/formatter/formatter_class.c b/ext/intl/formatter/formatter_class.c
index 5441033255..8fcda643bf 100755
--- a/ext/intl/formatter/formatter_class.c
+++ b/ext/intl/formatter/formatter_class.c
@@ -179,7 +179,7 @@ static zend_function_entry NumberFormatter_class_functions[] = {
PHP_NAMED_FE( getLocale, ZEND_FN( numfmt_get_locale ), arginfo_numberformatter_getlocale )
PHP_NAMED_FE( getErrorCode, ZEND_FN( numfmt_get_error_code ), arginfo_numberformatter_getpattern )
PHP_NAMED_FE( getErrorMessage, ZEND_FN( numfmt_get_error_message ), arginfo_numberformatter_getpattern )
- { NULL, NULL, NULL }
+ PHP_FE_END
};
/* }}} */
diff --git a/ext/intl/locale/locale_class.c b/ext/intl/locale/locale_class.c
index bba6449ac7..432cfb28fc 100755
--- a/ext/intl/locale/locale_class.c
+++ b/ext/intl/locale/locale_class.c
@@ -85,7 +85,7 @@ zend_function_entry Locale_class_functions[] = {
ZEND_FENTRY( lookup, ZEND_FN( locale_lookup ), locale_4_args, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
ZEND_FENTRY( canonicalize, ZEND_FN( locale_canonicalize ), locale_1_arg , ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
ZEND_FENTRY( acceptFromHttp, ZEND_FN( locale_accept_from_http ), locale_1_arg , ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
- { NULL, NULL, NULL }
+ PHP_FE_END
};
/* }}} */
diff --git a/ext/intl/msgformat/msgformat_class.c b/ext/intl/msgformat/msgformat_class.c
index 59e222a4fc..d0138854eb 100755
--- a/ext/intl/msgformat/msgformat_class.c
+++ b/ext/intl/msgformat/msgformat_class.c
@@ -144,7 +144,7 @@ static zend_function_entry MessageFormatter_class_functions[] = {
PHP_NAMED_FE( getLocale, ZEND_FN( msgfmt_get_locale ), arginfo_messageformatter_geterrormessage )
PHP_NAMED_FE( getErrorCode, ZEND_FN( msgfmt_get_error_code ), arginfo_messageformatter_geterrormessage )
PHP_NAMED_FE( getErrorMessage, ZEND_FN( msgfmt_get_error_message ), arginfo_messageformatter_geterrormessage )
- { NULL, NULL, NULL }
+ PHP_FE_END
};
/* }}} */
diff --git a/ext/intl/normalizer/normalizer_class.c b/ext/intl/normalizer/normalizer_class.c
index 736f7ecbf4..154d877e3f 100755
--- a/ext/intl/normalizer/normalizer_class.c
+++ b/ext/intl/normalizer/normalizer_class.c
@@ -44,7 +44,7 @@ ZEND_END_ARG_INFO()
zend_function_entry Normalizer_class_functions[] = {
ZEND_FENTRY( normalize, ZEND_FN( normalizer_normalize ), normalizer_3_args, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
ZEND_FENTRY( isNormalized, ZEND_FN( normalizer_is_normalized ), normalizer_3_args, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
- { NULL, NULL, NULL }
+ PHP_FE_END
};
/* }}} */
diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c
index 5d925ae6bf..5471e5b3f6 100644
--- a/ext/intl/resourcebundle/resourcebundle_class.c
+++ b/ext/intl/resourcebundle/resourcebundle_class.c
@@ -399,7 +399,7 @@ static zend_function_entry ResourceBundle_class_functions[] = {
ZEND_NAMED_ME( getLocales, ZEND_FN(resourcebundle_locales), arginfo_resourcebundle_getlocales, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC )
ZEND_NAMED_ME( getErrorCode, ZEND_FN(resourcebundle_get_error_code), arginfo_resourcebundle_get_error_code, ZEND_ACC_PUBLIC )
ZEND_NAMED_ME( getErrorMessage, ZEND_FN(resourcebundle_get_error_message), arginfo_resourcebundle_get_error_message, ZEND_ACC_PUBLIC )
- { NULL, NULL, NULL }
+ PHP_FE_END
};
/* }}} */
diff --git a/ext/intl/spoofchecker/spoofchecker_class.c b/ext/intl/spoofchecker/spoofchecker_class.c
index 3f00cdf15f..6c19fbb0f6 100755
--- a/ext/intl/spoofchecker/spoofchecker_class.c
+++ b/ext/intl/spoofchecker/spoofchecker_class.c
@@ -113,7 +113,7 @@ zend_function_entry Spoofchecker_class_functions[] = {
PHP_ME(Spoofchecker, areConfusable, spoofchecker_are_confusable, ZEND_ACC_PUBLIC)
PHP_ME(Spoofchecker, setAllowedLocales, spoofchecker_set_allowed_locales, ZEND_ACC_PUBLIC)
PHP_ME(Spoofchecker, setChecks, spoofchecker_set_checks, ZEND_ACC_PUBLIC)
- { NULL, NULL, NULL }
+ PHP_FE_END
};
/* }}} */
diff --git a/ext/intl/transliterator/transliterator_class.c b/ext/intl/transliterator/transliterator_class.c
index 727cf1e485..8d4d0649e9 100644
--- a/ext/intl/transliterator/transliterator_class.c
+++ b/ext/intl/transliterator/transliterator_class.c
@@ -386,7 +386,7 @@ zend_function_entry Transliterator_class_functions[] = {
PHP_ME_MAPPING( transliterate, transliterator_transliterate, ainfo_trans_me_transliterate, ZEND_ACC_PUBLIC )
PHP_ME_MAPPING( getErrorCode, transliterator_get_error_code, ainfo_trans_void, ZEND_ACC_PUBLIC )
PHP_ME_MAPPING( getErrorMessage,transliterator_get_error_message, ainfo_trans_void, ZEND_ACC_PUBLIC )
- { NULL, NULL, NULL }
+ PHP_FE_END
};
/* }}} */
diff --git a/ext/json/json.c b/ext/json/json.c
index fd8af799c8..39e3d4d7c9 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -75,7 +75,7 @@ ZEND_END_ARG_INFO();
static const zend_function_entry json_serializable_interface[] = {
PHP_ABSTRACT_ME(JsonSerializable, jsonSerialize, json_serialize_arginfo)
- { NULL, NULL, NULL }
+ PHP_FE_END
};
/* }}} */
diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index 0050cb35eb..752c52af83 100644
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -71,7 +71,7 @@ static const zend_function_entry user_filter_class_funcs[] = {
PHP_NAMED_FE(filter, PHP_FN(user_filter_nop), arginfo_php_user_filter_filter)
PHP_NAMED_FE(onCreate, PHP_FN(user_filter_nop), arginfo_php_user_filter_onCreate)
PHP_NAMED_FE(onClose, PHP_FN(user_filter_nop), arginfo_php_user_filter_onClose)
- { NULL, NULL, NULL }
+ PHP_FE_END
};
static zend_class_entry user_filter_class_entry;
diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c
index 319979e7a2..0c4e99303a 100644
--- a/sapi/apache_hooks/php_apache.c
+++ b/sapi/apache_hooks/php_apache.c
@@ -1384,7 +1384,7 @@ const static zend_function_entry php_apache_request_class_functions[] = {
PHP_FALIAS(method_uri, apache_request_sub_req_method_uri, NULL)
PHP_FALIAS(run, apache_request_run, NULL)
PHP_FALIAS(internal_redirect, apache_request_internal_redirect, NULL)
- { NULL, NULL, NULL }
+ PHP_FE_END
};
/* }}} */
diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c
index 0ea2bd7e7d..4161447733 100644
--- a/sapi/milter/php_milter.c
+++ b/sapi/milter/php_milter.c
@@ -833,7 +833,7 @@ const static zend_function_entry milter_functions[] = {
PHP_FE(smfi_addrcpt, arginfo_smfi_addrcpt)
PHP_FE(smfi_delrcpt, arginfo_smfi_delrcpt)
PHP_FE(smfi_replacebody, arginfo_smfi_replacebody)
- { NULL, NULL, NULL }
+ PHP_FE_END
};
/* }}} */
View Lorry Controller Status