#25314: Build error during Windows (32- and 64-bit builds) of Thunderbird -----------------------------------+------------------------ Reporter: sukhbir | Owner: (none) Type: defect | Status: new Priority: Medium | Milestone: Component: Applications/Tor Mail | Version: Severity: Normal | Resolution: Keywords: | Actual Points: Parent ID: | Points: Reviewer: | Sponsor: -----------------------------------+------------------------
Comment (by sukhbir): Patch; I am keeping it separate for now but since I will submit this upstream as well, I will combine it later. In comm-esr52: {{{ diff --git a/mailnews/base/search/src/nsMsgImapSearch.cpp b/mailnews/base/search/src/nsMsgImapSearch.cpp --- a/mailnews/base/search/src/nsMsgImapSearch.cpp +++ b/mailnews/base/search/src/nsMsgImapSearch.cpp @@ -84,7 +84,7 @@ nsresult nsMsgSearchOnlineMail::Encode (nsCString& pEncoding, nsISupportsArray *searchTerms, - const char16_t *destCharset) + char16ptr_t destCharset) { nsCString imapTerms; diff --git a/mailnews/base/search/src/nsMsgSearchImap.h b/mailnews/base/search/src/nsMsgSearchImap.h --- a/mailnews/base/search/src/nsMsgSearchImap.h +++ b/mailnews/base/search/src/nsMsgSearchImap.h @@ -24,7 +24,7 @@ static nsresult Encode (nsCString& ppEncoding, nsISupportsArray *searchTerms, - const char16_t *destCharset); + char16ptr_t destCharset); protected: }}} And in mozilla/ (tor-browser-52.6.0esr-7.5-2-build1): {{{ diff --git a/xpcom/glue/nsCRTGlue.h b/xpcom/glue/nsCRTGlue.h index 8caa1ae2727a..d80398a794c3 100644 --- a/xpcom/glue/nsCRTGlue.h +++ b/xpcom/glue/nsCRTGlue.h @@ -100,6 +100,11 @@ bool NS_IsLower(char aChar); bool NS_IsAscii(char16_t aChar); bool NS_IsAscii(const char16_t* aString); +#ifdef MOZ_USE_CHAR16_WRAPPER +bool NS_IsAscii(char16ptr_t aString) { + return NS_IsAscii(static_cast<const char16_t*>(aString)); +} +#endif bool NS_IsAsciiAlpha(char16_t aChar); bool NS_IsAsciiDigit(char16_t aChar); bool NS_IsAsciiWhitespace(char16_t aChar); }}} -- Ticket URL: <https://trac.torproject.org/projects/tor/ticket/25314#comment:2> Tor Bug Tracker & Wiki <https://trac.torproject.org/> The Tor Project: anonymity online
_______________________________________________ tor-bugs mailing list tor-bugs@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs