oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/icu: require at least version 50

Browse Source
This commit is contained in:
Max Kellermann 2018-08-02 21:01:12 +02:00
parent ca4c81dd84
commit 4b16a8bf84
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -467,7 +467,7 @@ AC_ARG_ENABLE(icu,
[enable libicu for Unicode (default: auto)]),, [enable libicu for Unicode (default: auto)]),,
enable_icu=auto) enable_icu=auto)
MPD_AUTO_PKG(icu, ICU, [icu-i18n], [libicu], [libicu not found]) MPD_AUTO_PKG(icu, ICU, [icu-i18n >= 50], [libicu], [libicu not found])
MPD_DEFINE_CONDITIONAL(enable_icu, HAVE_ICU, [libicu]) MPD_DEFINE_CONDITIONAL(enable_icu, HAVE_ICU, [libicu])
AC_ARG_ENABLE(iconv, AC_ARG_ENABLE(iconv,

15
src/lib/icu/Collate.cxx
View File

@ -85,23 +85,8 @@ IcuCollate(const char *a, const char *b) noexcept
#ifdef HAVE_ICU #ifdef HAVE_ICU
assert(collator != nullptr); assert(collator != nullptr);
#if U_ICU_VERSION_MAJOR_NUM >= 50
UErrorCode code = U_ZERO_ERROR; UErrorCode code = U_ZERO_ERROR;
return (int)ucol_strcollUTF8(collator, a, -1, b, -1, &code); return (int)ucol_strcollUTF8(collator, a, -1, b, -1, &code);
#else
/* fall back to ucol_strcoll() */
try {
const auto au = UCharFromUTF8(a);
const auto bu = UCharFromUTF8(b);
return ucol_strcoll(collator, au.begin(), au.size(),
bu.begin(), bu.size());
} catch (...) {
/* fall back to plain strcasecmp() */
return strcasecmp(a, b);
}
#endif
#elif defined(_WIN32) #elif defined(_WIN32)
AllocatedString<wchar_t> wa = nullptr, wb = nullptr; AllocatedString<wchar_t> wa = nullptr, wb = nullptr;