mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
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>
This commit is contained in:
parent
3d7b0b6f92
commit
3d4fbdade4
2 changed files with 0 additions and 11 deletions
|
@ -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_VERIFICATION_ERROR );
|
||||||
INTL_EXPOSE_CONST( U_IDNA_LABEL_TOO_LONG_ERROR );
|
INTL_EXPOSE_CONST( U_IDNA_LABEL_TOO_LONG_ERROR );
|
||||||
INTL_EXPOSE_CONST( U_IDNA_ZERO_LENGTH_LABEL_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 );
|
INTL_EXPOSE_CONST( U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR );
|
||||||
#endif
|
|
||||||
INTL_EXPOSE_CONST( U_IDNA_ERROR_LIMIT );
|
INTL_EXPOSE_CONST( U_IDNA_ERROR_LIMIT );
|
||||||
|
|
||||||
/* Aliases for StringPrep */
|
/* Aliases for StringPrep */
|
||||||
|
|
|
@ -26,10 +26,6 @@
|
||||||
#include "formatter_class.h"
|
#include "formatter_class.h"
|
||||||
#include "formatter_format.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
|
/* {{{ formatter_register_constants
|
||||||
* Register constants common for the both (OO and procedural)
|
* Register constants common for the both (OO and procedural)
|
||||||
* APIs.
|
* APIs.
|
||||||
|
@ -58,11 +54,6 @@ void formatter_register_constants( INIT_FUNC_ARGS )
|
||||||
|
|
||||||
FORMATTER_EXPOSE_CUSTOM_CLASS_CONST( "DEFAULT_STYLE", UNUM_DEFAULT );
|
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 */
|
/* UNumberFormatRoundingMode */
|
||||||
FORMATTER_EXPOSE_CLASS_CONST( ROUND_CEILING );
|
FORMATTER_EXPOSE_CLASS_CONST( ROUND_CEILING );
|
||||||
FORMATTER_EXPOSE_CLASS_CONST( ROUND_FLOOR );
|
FORMATTER_EXPOSE_CLASS_CONST( ROUND_FLOOR );
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue