Skip to content

Commit 3d4fbda

Browse files
committed
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>
1 parent 3d7b0b6 commit 3d4fbda

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

ext/intl/common/common_error.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,7 @@ void intl_expose_icu_error_codes( INIT_FUNC_ARGS )
241241
INTL_EXPOSE_CONST( U_IDNA_VERIFICATION_ERROR );
242242
INTL_EXPOSE_CONST( U_IDNA_LABEL_TOO_LONG_ERROR );
243243
INTL_EXPOSE_CONST( U_IDNA_ZERO_LENGTH_LABEL_ERROR );
244-
#if U_ICU_VERSION_MAJOR_NUM > 3 || U_ICU_VERSION_MAJOR_NUM == 3 && U_ICU_VERSION_MINOR_NUM >= 8
245244
INTL_EXPOSE_CONST( U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR );
246-
#endif
247245
INTL_EXPOSE_CONST( U_IDNA_ERROR_LIMIT );
248246

249247
/* Aliases for StringPrep */

ext/intl/formatter/formatter.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
#include "formatter_class.h"
2727
#include "formatter_format.h"
2828

29-
#if U_ICU_VERSION_MAJOR_NUM == 3 && U_ICU_VERSION_MINOR_NUM <= 4
30-
#define UNUM_MONETARY_GROUPING_SEPARATOR_SYMBOL 17
31-
#endif
32-
3329
/* {{{ formatter_register_constants
3430
* Register constants common for the both (OO and procedural)
3531
* APIs.
@@ -58,11 +54,6 @@ void formatter_register_constants( INIT_FUNC_ARGS )
5854

5955
FORMATTER_EXPOSE_CUSTOM_CLASS_CONST( "DEFAULT_STYLE", UNUM_DEFAULT );
6056

61-
/* workaround for ICU bug */
62-
#if U_ICU_VERSION_MAJOR_NUM == 3 && U_ICU_VERSION_MINOR_NUM < 8
63-
#define UNUM_ROUND_HALFEVEN UNUM_FOUND_HALFEVEN
64-
#endif
65-
6657
/* UNumberFormatRoundingMode */
6758
FORMATTER_EXPOSE_CLASS_CONST( ROUND_CEILING );
6859
FORMATTER_EXPOSE_CLASS_CONST( ROUND_FLOOR );

0 commit comments

Comments
 (0)