felipe                                   Sat, 06 Aug 2011 01:22:27 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=314352

Log:
- Added missing PHP_FE_END/ZEND_FE_END

Changed paths:
    U   php/php-src/branches/PHP_5_3/Zend/zend_API.c
    U   php/php-src/branches/PHP_5_3/ext/intl/collator/collator_class.c
    U   php/php-src/branches/PHP_5_3/ext/intl/dateformat/dateformat_class.c
    U   php/php-src/branches/PHP_5_3/ext/intl/formatter/formatter_class.c
    U   php/php-src/branches/PHP_5_3/ext/intl/locale/locale_class.c
    U   php/php-src/branches/PHP_5_3/ext/intl/msgformat/msgformat_class.c
    U   php/php-src/branches/PHP_5_3/ext/intl/normalizer/normalizer_class.c
    U   
php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.c
    U   php/php-src/branches/PHP_5_3/ext/standard/user_filters.c
    U   php/php-src/branches/PHP_5_3/sapi/apache_hooks/php_apache.c
    U   php/php-src/branches/PHP_5_3/sapi/milter/php_milter.c
    U   php/php-src/branches/PHP_5_4/Zend/zend_API.c
    U   php/php-src/branches/PHP_5_4/ext/intl/collator/collator_class.c
    U   php/php-src/branches/PHP_5_4/ext/intl/dateformat/dateformat_class.c
    U   php/php-src/branches/PHP_5_4/ext/intl/formatter/formatter_class.c
    U   php/php-src/branches/PHP_5_4/ext/intl/locale/locale_class.c
    U   php/php-src/branches/PHP_5_4/ext/intl/msgformat/msgformat_class.c
    U   php/php-src/branches/PHP_5_4/ext/intl/normalizer/normalizer_class.c
    U   
php/php-src/branches/PHP_5_4/ext/intl/resourcebundle/resourcebundle_class.c
    U   php/php-src/branches/PHP_5_4/ext/intl/spoofchecker/spoofchecker_class.c
    U   
php/php-src/branches/PHP_5_4/ext/intl/transliterator/transliterator_class.c
    U   php/php-src/branches/PHP_5_4/ext/json/json.c
    U   php/php-src/branches/PHP_5_4/ext/standard/user_filters.c
    U   php/php-src/branches/PHP_5_4/sapi/apache_hooks/php_apache.c
    U   php/php-src/branches/PHP_5_4/sapi/milter/php_milter.c
    U   php/php-src/trunk/Zend/zend_API.c
    U   php/php-src/trunk/ext/intl/collator/collator_class.c
    U   php/php-src/trunk/ext/intl/dateformat/dateformat_class.c
    U   php/php-src/trunk/ext/intl/formatter/formatter_class.c
    U   php/php-src/trunk/ext/intl/locale/locale_class.c
    U   php/php-src/trunk/ext/intl/msgformat/msgformat_class.c
    U   php/php-src/trunk/ext/intl/normalizer/normalizer_class.c
    U   php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.c
    U   php/php-src/trunk/ext/intl/spoofchecker/spoofchecker_class.c
    U   php/php-src/trunk/ext/intl/transliterator/transliterator_class.c
    U   php/php-src/trunk/ext/json/json.c
    U   php/php-src/trunk/ext/standard/user_filters.c
    U   php/php-src/trunk/sapi/apache_hooks/php_apache.c
    U   php/php-src/trunk/sapi/milter/php_milter.c

Modified: php/php-src/branches/PHP_5_3/Zend/zend_API.c
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_API.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_3/Zend/zend_API.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -2308,7 +2308,7 @@

 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) /* {{{ */
@@ -2334,7 +2334,7 @@
 /* }}} */

 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) /* {{{ */

Modified: php/php-src/branches/PHP_5_3/ext/intl/collator/collator_class.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/collator/collator_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_3/ext/intl/collator/collator_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -127,7 +127,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_3/ext/intl/dateformat/dateformat_class.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/dateformat/dateformat_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_3/ext/intl/dateformat/dateformat_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -170,7 +170,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_3/ext/intl/formatter/formatter_class.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/formatter/formatter_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_3/ext/intl/formatter/formatter_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -179,7 +179,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_3/ext/intl/locale/locale_class.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/locale/locale_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_3/ext/intl/locale/locale_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -85,7 +85,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_3/ext/intl/msgformat/msgformat_class.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/msgformat/msgformat_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_3/ext/intl/msgformat/msgformat_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -144,7 +144,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_3/ext/intl/normalizer/normalizer_class.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/normalizer/normalizer_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_3/ext/intl/normalizer/normalizer_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -44,7 +44,7 @@
 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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -399,7 +399,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_3/ext/standard/user_filters.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/user_filters.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_3/ext/standard/user_filters.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -71,7 +71,7 @@
 	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;

Modified: php/php-src/branches/PHP_5_3/sapi/apache_hooks/php_apache.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/apache_hooks/php_apache.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_3/sapi/apache_hooks/php_apache.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -1384,7 +1384,7 @@
     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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_3/sapi/milter/php_milter.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/milter/php_milter.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_3/sapi/milter/php_milter.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -833,7 +833,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_4/Zend/zend_API.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_API.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_4/Zend/zend_API.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -2505,7 +2505,7 @@

 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 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) /* {{{ */

Modified: php/php-src/branches/PHP_5_4/ext/intl/collator/collator_class.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/intl/collator/collator_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_4/ext/intl/collator/collator_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -127,7 +127,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_4/ext/intl/dateformat/dateformat_class.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/intl/dateformat/dateformat_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_4/ext/intl/dateformat/dateformat_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -170,7 +170,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_4/ext/intl/formatter/formatter_class.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/intl/formatter/formatter_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_4/ext/intl/formatter/formatter_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -179,7 +179,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_4/ext/intl/locale/locale_class.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/intl/locale/locale_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_4/ext/intl/locale/locale_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -85,7 +85,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_4/ext/intl/msgformat/msgformat_class.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/intl/msgformat/msgformat_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_4/ext/intl/msgformat/msgformat_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -144,7 +144,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_4/ext/intl/normalizer/normalizer_class.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/intl/normalizer/normalizer_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_4/ext/intl/normalizer/normalizer_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -44,7 +44,7 @@
 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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_4/ext/intl/resourcebundle/resourcebundle_class.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/intl/resourcebundle/resourcebundle_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_4/ext/intl/resourcebundle/resourcebundle_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -399,7 +399,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_4/ext/intl/spoofchecker/spoofchecker_class.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/intl/spoofchecker/spoofchecker_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_4/ext/intl/spoofchecker/spoofchecker_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -113,7 +113,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_4/ext/intl/transliterator/transliterator_class.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/intl/transliterator/transliterator_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_4/ext/intl/transliterator/transliterator_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -386,7 +386,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_4/ext/json/json.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/json/json.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_4/ext/json/json.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -75,7 +75,7 @@

 static const zend_function_entry json_serializable_interface[] = {
 	PHP_ABSTRACT_ME(JsonSerializable, jsonSerialize, json_serialize_arginfo)
-	{ NULL, NULL, NULL }
+	PHP_FE_END
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_4/ext/standard/user_filters.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/user_filters.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_4/ext/standard/user_filters.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -71,7 +71,7 @@
 	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;

Modified: php/php-src/branches/PHP_5_4/sapi/apache_hooks/php_apache.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/apache_hooks/php_apache.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_4/sapi/apache_hooks/php_apache.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -1384,7 +1384,7 @@
     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
 };
 /* }}} */


Modified: php/php-src/branches/PHP_5_4/sapi/milter/php_milter.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/milter/php_milter.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/branches/PHP_5_4/sapi/milter/php_milter.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -833,7 +833,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/trunk/Zend/zend_API.c
===================================================================
--- php/php-src/trunk/Zend/zend_API.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/trunk/Zend/zend_API.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -2505,7 +2505,7 @@

 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 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) /* {{{ */

Modified: php/php-src/trunk/ext/intl/collator/collator_class.c
===================================================================
--- php/php-src/trunk/ext/intl/collator/collator_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/trunk/ext/intl/collator/collator_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -127,7 +127,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/trunk/ext/intl/dateformat/dateformat_class.c
===================================================================
--- php/php-src/trunk/ext/intl/dateformat/dateformat_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/trunk/ext/intl/dateformat/dateformat_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -170,7 +170,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/trunk/ext/intl/formatter/formatter_class.c
===================================================================
--- php/php-src/trunk/ext/intl/formatter/formatter_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/trunk/ext/intl/formatter/formatter_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -179,7 +179,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/trunk/ext/intl/locale/locale_class.c
===================================================================
--- php/php-src/trunk/ext/intl/locale/locale_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/trunk/ext/intl/locale/locale_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -85,7 +85,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/trunk/ext/intl/msgformat/msgformat_class.c
===================================================================
--- php/php-src/trunk/ext/intl/msgformat/msgformat_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/trunk/ext/intl/msgformat/msgformat_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -144,7 +144,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/trunk/ext/intl/normalizer/normalizer_class.c
===================================================================
--- php/php-src/trunk/ext/intl/normalizer/normalizer_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/trunk/ext/intl/normalizer/normalizer_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -44,7 +44,7 @@
 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
 };
 /* }}} */


Modified: php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.c
===================================================================
--- php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -399,7 +399,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/trunk/ext/intl/spoofchecker/spoofchecker_class.c
===================================================================
--- php/php-src/trunk/ext/intl/spoofchecker/spoofchecker_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/trunk/ext/intl/spoofchecker/spoofchecker_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -113,7 +113,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/trunk/ext/intl/transliterator/transliterator_class.c
===================================================================
--- php/php-src/trunk/ext/intl/transliterator/transliterator_class.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/trunk/ext/intl/transliterator/transliterator_class.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -386,7 +386,7 @@
 	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
 };
 /* }}} */


Modified: php/php-src/trunk/ext/json/json.c
===================================================================
--- php/php-src/trunk/ext/json/json.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/trunk/ext/json/json.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -75,7 +75,7 @@

 static const zend_function_entry json_serializable_interface[] = {
 	PHP_ABSTRACT_ME(JsonSerializable, jsonSerialize, json_serialize_arginfo)
-	{ NULL, NULL, NULL }
+	PHP_FE_END
 };
 /* }}} */


Modified: php/php-src/trunk/ext/standard/user_filters.c
===================================================================
--- php/php-src/trunk/ext/standard/user_filters.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/trunk/ext/standard/user_filters.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -71,7 +71,7 @@
 	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;

Modified: php/php-src/trunk/sapi/apache_hooks/php_apache.c
===================================================================
--- php/php-src/trunk/sapi/apache_hooks/php_apache.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/trunk/sapi/apache_hooks/php_apache.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -1384,7 +1384,7 @@
     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
 };
 /* }}} */


Modified: php/php-src/trunk/sapi/milter/php_milter.c
===================================================================
--- php/php-src/trunk/sapi/milter/php_milter.c	2011-08-06 01:11:53 UTC (rev 314351)
+++ php/php-src/trunk/sapi/milter/php_milter.c	2011-08-06 01:22:27 UTC (rev 314352)
@@ -833,7 +833,7 @@
 	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
 };
 /* }}} */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to