summaryrefslogtreecommitdiffstats
path: root/mailnews/compose/src
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-11-10 21:16:23 -0500
committerMatt A. Tobin <email@mattatobin.com>2019-11-10 21:16:23 -0500
commite661493bb0440e66b4c8af56a81c88e878dd1365 (patch)
tree233d31e538f2a9df5bd21193f02dbed33cc3cf99 /mailnews/compose/src
parent1f5f6a4bf0163f4dcf0fd6778611891165c334ff (diff)
downloadUXP-e661493bb0440e66b4c8af56a81c88e878dd1365.tar
UXP-e661493bb0440e66b4c8af56a81c88e878dd1365.tar.gz
UXP-e661493bb0440e66b4c8af56a81c88e878dd1365.tar.lz
UXP-e661493bb0440e66b4c8af56a81c88e878dd1365.tar.xz
UXP-e661493bb0440e66b4c8af56a81c88e878dd1365.zip
Bug 1442648 - Fix mismatched types in mingw-w64 builds (const char16_t*/char16ptr_t).
When cross-compiling for Windows on Linux, fix mismatched types in nsMsgImapSearch.cpp. nsString::get() returns a char16ptr_t (with MOZ_USE_CHAR16_WRAPPER) and that causes a mismatch so we cast it to a const char16_t*. usAsciiCharSet is declared as a nsAutoString so we instead declare it as a char16_t* to avoid subsequent type mismatches. Tag #1273
Diffstat (limited to 'mailnews/compose/src')
-rw-r--r--mailnews/compose/src/nsMsgCompUtils.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp
index 4615f0f36..6632e3257 100644
--- a/mailnews/compose/src/nsMsgCompUtils.cpp
+++ b/mailnews/compose/src/nsMsgCompUtils.cpp
@@ -975,7 +975,7 @@ RFC2231ParmFolding(const char *parmName, const nsCString& charset,
bool needEscape;
nsCString dupParm;
- if (!NS_IsAscii(parmValue.get()) || is7bitCharset(charset)) {
+ if (!NS_IsAscii(static_cast<const char16_t*>(parmValue.get())) || is7bitCharset(charset)) {
needEscape = true;
nsAutoCString nativeParmValue;
ConvertFromUnicode(charset.get(), parmValue, nativeParmValue);