diff options
| -rw-r--r-- | ext/intl/common/common_error.c | 2 | ||||
| -rw-r--r-- | ext/intl/formatter/formatter.c | 9 |
2 files changed, 0 insertions, 11 deletions
diff --git a/ext/intl/common/common_error.c b/ext/intl/common/common_error.c index 16933c587f..0c0057a8fe 100644 --- a/ext/intl/common/common_error.c +++ b/ext/intl/common/common_error.c @@ -241,9 +241,7 @@ void intl_expose_icu_error_codes( INIT_FUNC_ARGS ) INTL_EXPOSE_CONST( U_IDNA_VERIFICATION_ERROR ); INTL_EXPOSE_CONST( U_IDNA_LABEL_TOO_LONG_ERROR ); INTL_EXPOSE_CONST( U_IDNA_ZERO_LENGTH_LABEL_ERROR ); -#if U_ICU_VERSION_MAJOR_NUM > 3 || U_ICU_VERSION_MAJOR_NUM == 3 && U_ICU_VERSION_MINOR_NUM >= 8 INTL_EXPOSE_CONST( U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR ); -#endif INTL_EXPOSE_CONST( U_IDNA_ERROR_LIMIT ); /* Aliases for StringPrep */ diff --git a/ext/intl/formatter/formatter.c b/ext/intl/formatter/formatter.c index 7e0f0df68b..76db688aeb 100644 --- a/ext/intl/formatter/formatter.c +++ b/ext/intl/formatter/formatter.c @@ -26,10 +26,6 @@ #include "formatter_class.h" #include "formatter_format.h" -#if U_ICU_VERSION_MAJOR_NUM == 3 && U_ICU_VERSION_MINOR_NUM <= 4 -#define UNUM_MONETARY_GROUPING_SEPARATOR_SYMBOL 17 -#endif - /* {{{ formatter_register_constants * Register constants common for the both (OO and procedural) * APIs. @@ -58,11 +54,6 @@ void formatter_register_constants( INIT_FUNC_ARGS ) FORMATTER_EXPOSE_CUSTOM_CLASS_CONST( "DEFAULT_STYLE", UNUM_DEFAULT ); -/* workaround for ICU bug */ -#if U_ICU_VERSION_MAJOR_NUM == 3 && U_ICU_VERSION_MINOR_NUM < 8 -#define UNUM_ROUND_HALFEVEN UNUM_FOUND_HALFEVEN -#endif - /* UNumberFormatRoundingMode */ FORMATTER_EXPOSE_CLASS_CONST( ROUND_CEILING ); FORMATTER_EXPOSE_CLASS_CONST( ROUND_FLOOR ); |