svn: /php/php-src/ branches/PHP_5_4/ext/intl/common/common_error.c trunk/ext/intl/common/common_error.c

cataphract Sat, 26 Nov 2011 14:55:31 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=319952 Log: - Fixed bug #60392 (U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR undeclared) (fedora at famillecollet dot com) Bug: https://bugs.php.net/60392 (Open) 'U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR' undeclared Changed paths: U php/php-src/branches/PHP_5_4/ext/intl/common/common_error.c U php/php-src/trunk/ext/intl/common/common_error.c Modified: php/php-src/branches/PHP_5_4/ext/intl/common/common_error.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/intl/common/common_error.c 2011-11-26 12:08:23 UTC (rev 319951) +++ php/php-src/branches/PHP_5_4/ext/intl/common/common_error.c 2011-11-26 14:55:31 UTC (rev 319952) @@ -241,7 +241,9 @@ 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 */ Modified: php/php-src/trunk/ext/intl/common/common_error.c =================================================================== --- php/php-src/trunk/ext/intl/common/common_error.c 2011-11-26 12:08:23 UTC (rev 319951) +++ php/php-src/trunk/ext/intl/common/common_error.c 2011-11-26 14:55:31 UTC (rev 319952) @@ -241,7 +241,9 @@ 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 */