From 4fc0bae7eb3d30cf8fb5c17cfcab967748107979 Mon Sep 17 00:00:00 2001
From: "dolske@mozilla.com" <dolske@mozilla.com>
Date: Thu, 10 Jan 2008 01:10:21 -0800
Subject: [PATCH] Solaris bustage fix (r=jst) for Bug 394272 - Mingw build
 error in nsDownloadManager.cpp

---
 toolkit/components/downloads/src/nsDownloadManager.cpp | 8 ++++----
 toolkit/components/downloads/src/nsDownloadManager.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/toolkit/components/downloads/src/nsDownloadManager.cpp b/toolkit/components/downloads/src/nsDownloadManager.cpp
index 67a22a03ddf..915a58f98e4 100644
--- a/toolkit/components/downloads/src/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/src/nsDownloadManager.cpp
@@ -129,7 +129,7 @@ nsDownloadManager::GetSingleton()
 
 nsDownloadManager::~nsDownloadManager()
 {
-#if defined(XP_WIN) and !defined(__MINGW32__)
+#if defined(XP_WIN) && !defined(__MINGW32__)
   delete mScanner;
 #endif
   gDownloadManagerService = nsnull;
@@ -838,7 +838,7 @@ nsDownloadManager::Init()
                                    getter_AddRefs(mBundle));
   NS_ENSURE_SUCCESS(rv, rv);
 
-#if defined(XP_WIN) and !defined(__MINGW32__)
+#if defined(XP_WIN) && !defined(__MINGW32__)
   mScanner = new nsDownloadScanner();
   if (!mScanner)
     return NS_ERROR_OUT_OF_MEMORY;
@@ -1781,7 +1781,7 @@ nsDownload::SetState(DownloadState aState)
       // Transfers are finished, so break the reference cycle
       Finalize();
       break;
-#if defined(XP_WIN) and !defined(__MINGW32__)
+#if defined(XP_WIN) && !defined(__MINGW32__)
     case nsIDownloadManager::DOWNLOAD_SCANNING:
     {
       nsresult rv = mDownloadManager->mScanner ? mDownloadManager->mScanner->ScanDownload(this) : NS_ERROR_NOT_INITIALIZED;
@@ -2085,7 +2085,7 @@ nsDownload::OnStateChange(nsIWebProgress *aWebProgress,
       mPercentComplete = 100;
       mLastUpdate = PR_Now();
 
-#if defined(XP_WIN) and !defined(__MINGW32__)
+#if defined(XP_WIN) && !defined(__MINGW32__)
       (void)SetState(nsIDownloadManager::DOWNLOAD_SCANNING);
 #else
       (void)SetState(nsIDownloadManager::DOWNLOAD_FINISHED);
diff --git a/toolkit/components/downloads/src/nsDownloadManager.h b/toolkit/components/downloads/src/nsDownloadManager.h
index 01e36719cef..0388c5cbd10 100644
--- a/toolkit/components/downloads/src/nsDownloadManager.h
+++ b/toolkit/components/downloads/src/nsDownloadManager.h
@@ -71,7 +71,7 @@ typedef PRInt16 DownloadType;
 
 class nsDownload;
 
-#if defined(XP_WIN) and !defined(__MINGW32__)
+#if defined(XP_WIN) && !defined(__MINGW32__)
 class nsDownloadScanner;
 #endif
 
@@ -88,7 +88,7 @@ public:
   static nsDownloadManager *GetSingleton();
 
   virtual ~nsDownloadManager();
-#if defined(XP_WIN) and !defined(__MINGW32__)
+#if defined(XP_WIN) && !defined(__MINGW32__)
   nsDownloadManager() : mScanner(nsnull) { };
 private:
   nsDownloadScanner *mScanner;