summaryrefslogtreecommitdiff
path: root/deps/icu-small/source/i18n
diff options
context:
space:
mode:
Diffstat (limited to 'deps/icu-small/source/i18n')
-rw-r--r--deps/icu-small/source/i18n/digitlst.cpp4
-rw-r--r--deps/icu-small/source/i18n/scriptset.cpp2
-rw-r--r--deps/icu-small/source/i18n/uspoof.cpp7
3 files changed, 3 insertions, 10 deletions
diff --git a/deps/icu-small/source/i18n/digitlst.cpp b/deps/icu-small/source/i18n/digitlst.cpp
index 8bb470c8f0..e3873eb59f 100644
--- a/deps/icu-small/source/i18n/digitlst.cpp
+++ b/deps/icu-small/source/i18n/digitlst.cpp
@@ -60,8 +60,8 @@
# endif
#endif
-#if U_USE_STRTOD_L && !U_PLATFORM_USES_ONLY_WIN32_API
-# if U_PLATFORM == U_PF_CYGWIN
+#if U_USE_STRTOD_L
+# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
# include <locale.h>
# else
# include <xlocale.h>
diff --git a/deps/icu-small/source/i18n/scriptset.cpp b/deps/icu-small/source/i18n/scriptset.cpp
index ab7cb1e68e..951fe44080 100644
--- a/deps/icu-small/source/i18n/scriptset.cpp
+++ b/deps/icu-small/source/i18n/scriptset.cpp
@@ -258,7 +258,7 @@ void ScriptSet::setScriptExtensions(UChar32 codePoint, UErrorCode& status) {
while (TRUE) {
script_count = uscript_getScriptExtensions(
- codePoint, scripts.getAlias(), FIRST_GUESS_SCRIPT_CAPACITY, &internalStatus);
+ codePoint, scripts.getAlias(), scripts.getCapacity(), &internalStatus);
if (internalStatus == U_BUFFER_OVERFLOW_ERROR) {
// Need to allocate more space
if (scripts.resize(script_count) == NULL) {
diff --git a/deps/icu-small/source/i18n/uspoof.cpp b/deps/icu-small/source/i18n/uspoof.cpp
index 3be10862fc..d81b5b2149 100644
--- a/deps/icu-small/source/i18n/uspoof.cpp
+++ b/deps/icu-small/source/i18n/uspoof.cpp
@@ -646,13 +646,6 @@ uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
return dest;
}
- // Check that at least one of the CONFUSABLE flags is turned on. If not,
- // return an error.
- if ((This->fChecks & USPOOF_CONFUSABLE) == 0) {
- *status = U_ILLEGAL_ARGUMENT_ERROR;
- return dest;
- }
-
UnicodeString nfdId;
gNfdNormalizer->normalize(id, nfdId, *status);