1 files changed, 6 insertions, 16 deletions

diff --git a/ext/intl/common/common_enum.cpp b/ext/intl/common/common_enum.cpp
index 446ffad82e..9d823ead57 100644
--- a/ext/intl/common/common_enum.cpp
+++ b/ext/intl/common/common_enum.cpp
@@ -204,7 +204,7 @@ static zend_object *IntlIterator_object_create(zend_class_entry *ce)
 	return &intern->zo;
 }
 
-static PHP_METHOD(IntlIterator, current)
+PHP_METHOD(IntlIterator, current)
 {
 	zval *data;
 	INTLITERATOR_METHOD_INIT_VARS;
@@ -220,7 +220,7 @@ static PHP_METHOD(IntlIterator, current)
 	}
 }
 
-static PHP_METHOD(IntlIterator, key)
+PHP_METHOD(IntlIterator, key)
 {
 	INTLITERATOR_METHOD_INIT_VARS;
 
@@ -237,7 +237,7 @@ static PHP_METHOD(IntlIterator, key)
 	}
 }
 
-static PHP_METHOD(IntlIterator, next)
+PHP_METHOD(IntlIterator, next)
 {
 	INTLITERATOR_METHOD_INIT_VARS;
 
@@ -252,7 +252,7 @@ static PHP_METHOD(IntlIterator, next)
 	ii->iterator->index++;
 }
 
-static PHP_METHOD(IntlIterator, rewind)
+PHP_METHOD(IntlIterator, rewind)
 {
 	INTLITERATOR_METHOD_INIT_VARS;
 
@@ -269,7 +269,7 @@ static PHP_METHOD(IntlIterator, rewind)
 	}
 }
 
-static PHP_METHOD(IntlIterator, valid)
+PHP_METHOD(IntlIterator, valid)
 {
 	INTLITERATOR_METHOD_INIT_VARS;
 
@@ -281,16 +281,6 @@ static PHP_METHOD(IntlIterator, valid)
 	RETURN_BOOL(ii->iterator->funcs->valid(ii->iterator) == SUCCESS);
 }
 
-static const zend_function_entry IntlIterator_class_functions[] = {
-	PHP_ME(IntlIterator,	current,	arginfo_class_IntlIterator_current,		ZEND_ACC_PUBLIC)
-	PHP_ME(IntlIterator,	key,		arginfo_class_IntlIterator_key,			ZEND_ACC_PUBLIC)
-	PHP_ME(IntlIterator,	next,		arginfo_class_IntlIterator_next,		ZEND_ACC_PUBLIC)
-	PHP_ME(IntlIterator,	rewind,		arginfo_class_IntlIterator_rewind,		ZEND_ACC_PUBLIC)
-	PHP_ME(IntlIterator,	valid,		arginfo_class_IntlIterator_valid,		ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
-
 /* {{{ intl_register_IntlIterator_class
  * Initialize 'IntlIterator' class
  */
@@ -299,7 +289,7 @@ U_CFUNC void intl_register_IntlIterator_class(void)
 	zend_class_entry ce;
 
 	/* Create and register 'IntlIterator' class. */
-	INIT_CLASS_ENTRY(ce, "IntlIterator", IntlIterator_class_functions);
+	INIT_CLASS_ENTRY(ce, "IntlIterator", class_IntlIterator_methods);
 	ce.create_object = IntlIterator_object_create;
 	IntlIterator_ce_ptr = zend_register_internal_class(&ce);
 	IntlIterator_ce_ptr->get_iterator = IntlIterator_get_iterator;