Merge pull request #15568 from lanza/normalizeunicodeto59

change icu version check in UnicodeNormalization to 59
This commit is contained in:
Saleem Abdulrasool
2018-03-29 12:01:10 -04:00
committed by GitHub

View File

@@ -203,8 +203,8 @@ int32_t swift::__swift_stdlib_unorm2_normalize(
const __swift_stdlib_UNormalizer2 *norm, const __swift_stdlib_UChar *src,
__swift_int32_t len, __swift_stdlib_UChar *dst, __swift_int32_t capacity,
__swift_stdlib_UErrorCode *err) {
// TODO remove this compatibility when we require ICU >= 60 on Linux
#if defined(__APPLE__) || U_ICU_VERSION_MAJOR_NUM >= 60
// TODO remove this compatibility when we require ICU >= 59 on Linux
#if defined(__APPLE__) || U_ICU_VERSION_MAJOR_NUM >= 59
return unorm2_normalize(ptr_cast<UNormalizer2>(norm), src, len, dst, capacity,
ptr_cast<UErrorCode>(err));
#else