diff options
| author | Ondřej Surý <ondrej@sury.org> | 2012-02-01 21:25:15 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2012-02-01 21:25:15 +0100 |
| commit | 96fb2ff5760132a915766f1d9ec7c63001feacd8 (patch) | |
| tree | 160904a89a8f3522fa4e47632db101b045e7814a /ext/intl/common/common_error.c | |
| parent | 8f1428d29ef91d74b4d272af171675f2971eb15b (diff) | |
| download | php-96fb2ff5760132a915766f1d9ec7c63001feacd8.tar.gz | |
Imported Upstream version 5.4.0~rc6upstream/5.4.0_rc6
Diffstat (limited to 'ext/intl/common/common_error.c')
| -rwxr-xr-x | ext/intl/common/common_error.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/intl/common/common_error.c b/ext/intl/common/common_error.c index 3ab7fdfbd..24ded0c9f 100755 --- a/ext/intl/common/common_error.c +++ b/ext/intl/common/common_error.c @@ -232,7 +232,6 @@ void intl_expose_icu_error_codes( INIT_FUNC_ARGS ) INTL_EXPOSE_CONST( U_REGEX_ERROR_LIMIT ); /* The error code in the range 0x10400-0x104ff are reserved for IDNA related error codes */ -#if defined(U_IDNA_PROHIBITED_ERROR) INTL_EXPOSE_CONST( U_IDNA_PROHIBITED_ERROR ); INTL_EXPOSE_CONST( U_IDNA_ERROR_START ); INTL_EXPOSE_CONST( U_IDNA_UNASSIGNED_ERROR ); @@ -242,8 +241,10 @@ 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 ); - INTL_EXPOSE_CONST( U_IDNA_ERROR_LIMIT ); +#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 */ INTL_EXPOSE_CONST( U_STRINGPREP_PROHIBITED_ERROR ); |