summaryrefslogtreecommitdiff
path: root/fxjs
diff options
context:
space:
mode:
Diffstat (limited to 'fxjs')
-rw-r--r--fxjs/cjs_publicmethods.cpp2
-rw-r--r--fxjs/cjs_util.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/fxjs/cjs_publicmethods.cpp b/fxjs/cjs_publicmethods.cpp
index 28df0a305b..81a84d286b 100644
--- a/fxjs/cjs_publicmethods.cpp
+++ b/fxjs/cjs_publicmethods.cpp
@@ -285,7 +285,7 @@ bool CJS_PublicMethods::MaskSatisfied(wchar_t c_Change, wchar_t c_Mask) {
case L'A':
return FXSYS_iswASCIIalpha(c_Change);
case L'O':
- return FXSYS_iswASCIIalnum(c_Change);
+ return isascii(c_Change) && isalnum(c_Change);
case L'X':
return true;
default:
diff --git a/fxjs/cjs_util.cpp b/fxjs/cjs_util.cpp
index d552fcdf34..d73c238488 100644
--- a/fxjs/cjs_util.cpp
+++ b/fxjs/cjs_util.cpp
@@ -311,7 +311,7 @@ WideString CJS_Util::printx(const WideString& wsFormat,
} break;
case 'X': {
if (iSourceIdx < wsSource.GetLength()) {
- if (FXSYS_iswASCIIalnum(wsSource[iSourceIdx])) {
+ if (isascii(wsSource[iSourceIdx]) && isalnum(wsSource[iSourceIdx])) {
wsResult += TranslateCase(wsSource[iSourceIdx], eCaseMode);
++iFormatIdx;
}