From e661493bb0440e66b4c8af56a81c88e878dd1365 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 10 Nov 2019 21:16:23 -0500 Subject: 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 --- mailnews/compose/src/nsMsgCompUtils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mailnews/compose/src') 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(parmValue.get())) || is7bitCharset(charset)) { needEscape = true; nsAutoCString nativeParmValue; ConvertFromUnicode(charset.get(), parmValue, nativeParmValue); -- cgit v1.2.3