From 14de058086d76ac344fde67fc343023fc00279a9 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 6 Apr 2018 21:33:13 +0200 Subject: Rethink conditions Raise the requirement to ICU 56. Mixing both old and new normalizer APIs would create too much complexity. Therefore go by the recommended ICU version where all the normalizer API became stable. For the older ICU, the deprecated normalizer API is used. --- ext/intl/php_intl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/intl/php_intl.c') diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 9b52abc6fb..05832eaa34 100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -206,7 +206,7 @@ ZEND_BEGIN_ARG_INFO_EX(normalizer_args, 0, 0, 1) ZEND_ARG_INFO(0, form) ZEND_END_ARG_INFO() -#if U_ICU_VERSION_MAJOR_NUM >= 49 +#if U_ICU_VERSION_MAJOR_NUM >= 56 ZEND_BEGIN_ARG_INFO_EX(decomposition_args, 0, 0, 1) ZEND_ARG_INFO(0, input) ZEND_END_ARG_INFO(); @@ -668,7 +668,7 @@ static const zend_function_entry intl_functions[] = { /* normalizer functions */ PHP_FE( normalizer_normalize, normalizer_args ) PHP_FE( normalizer_is_normalized, normalizer_args ) -#if U_ICU_VERSION_MAJOR_NUM >= 49 +#if U_ICU_VERSION_MAJOR_NUM >= 56 PHP_FE( normalizer_get_raw_decomposition, decomposition_args ) #endif -- cgit v1.2.1