fix linux build bustage

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;
 

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