diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-11-10 21:16:23 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-11-10 21:16:23 -0500 |
| commit | e661493bb0440e66b4c8af56a81c88e878dd1365 (patch) | |
| tree | 233d31e538f2a9df5bd21193f02dbed33cc3cf99 /mailnews/compose | |
| parent | 1f5f6a4bf0163f4dcf0fd6778611891165c334ff (diff) | |
| download | uxp-e661493bb0440e66b4c8af56a81c88e878dd1365.tar.gz | |
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')
| -rw-r--r-- | mailnews/compose/src/nsMsgCompUtils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp index 4615f0f362..6632e3257c 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); |