com php-src: Remove needless version checks: ext/intl/common/co mmon_error.c ext/intl/formatter/formatter.c

From: Date: Wed, 01 Aug 2018 15:53:38 +0000
Subject: com php-src: Remove needless version checks: ext/intl/common/co mmon_error.c ext/intl/formatter/formatter.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-102772@lists.php.net to get a copy of this message
Commit: 3d4fbdade43c040293e6de4a1b9fb4781c5c1ee5 Author: Christoph M. Becker <cmbecker69@gmx.de> Wed, 1 Aug 2018 17:39:34 +0200 Parents: 3d7b0b6f92d9c89f8d39160b5a633f3693460aff Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3d4fbdade43c040293e6de4a1b9fb4781c5c1ee5 Log: Remove needless version checks As of PHP 5.5.3, we're requiring ICU ≥ 4.0[1] anyway, so there's no need to check for ICU 3.x. [1] <http://git.php.net/?p=php-src.git;a=commit;h=8831b00> Changed paths: M ext/intl/common/common_error.c M ext/intl/formatter/formatter.c Diff: diff --git a/ext/intl/common/common_error.c b/ext/intl/common/common_error.c index 16933c5..0c0057a 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 7e0f0df..76db688 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 );

« previous php.cvs (#102772) next »