From 5ba864b7c17e88d8e32e4ae4431727c61a6b2d67 Mon Sep 17 00:00:00 2001 From: "bienvenu%netscape.com" Date: Thu, 20 Apr 2000 01:36:16 +0000 Subject: [PATCH] fix linux build bustage --- mailnews/base/search/src/nsMsgSearchAdapter.cpp | 2 +- mailnews/base/search/src/nsMsgSearchTerm.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mailnews/base/search/src/nsMsgSearchAdapter.cpp b/mailnews/base/search/src/nsMsgSearchAdapter.cpp index c387f6740cb4..00c966122205 100644 --- a/mailnews/base/search/src/nsMsgSearchAdapter.cpp +++ b/mailnews/base/search/src/nsMsgSearchAdapter.cpp @@ -116,7 +116,7 @@ NS_IMETHODIMP nsMsgSearchAdapter::GetEncoding (char **encoding) char * -nsMsgSearchAdapter::TryToConvertCharset(char *sourceStr, const PRUnichar *srcCharset, const PRUnichar * destCharset, XP_Bool useMime2) +nsMsgSearchAdapter::TryToConvertCharset(char *sourceStr, const PRUnichar *srcCharset, const PRUnichar * destCharset, PRBool useMime2) { char *result = NULL; diff --git a/mailnews/base/search/src/nsMsgSearchTerm.cpp b/mailnews/base/search/src/nsMsgSearchTerm.cpp index 4d078f6c5038..6bb1378ac5a1 100644 --- a/mailnews/base/search/src/nsMsgSearchTerm.cpp +++ b/mailnews/base/search/src/nsMsgSearchTerm.cpp @@ -1202,7 +1202,7 @@ nsresult nsMsgSearchScopeTerm::TimeSlice (PRBool *aDone) nsresult nsMsgSearchScopeTerm::InitializeAdapter (nsMsgSearchTermArray &termList) { - NS_ASSERTION (m_adapter == NULL, "already initialized"); + NS_ASSERTION (m_adapter == nsnull, "already initialized"); nsresult err = NS_OK; // mscott: i have added m_searchServer into this switch to take into account the user's preference