wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Solaris bustage fix (r=jst) for Bug 394272 - Mingw build error in nsDownloadManager.cpp

Browse Source
This commit is contained in:
dolske@mozilla.com 2008-01-10 01:10:21 -08:00
parent 0243143104
commit 0dae9c8ae9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toolkit/components/downloads/src/nsDownloadManager.cpp
View File

@ -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);

4
toolkit/components/downloads/src/nsDownloadManager.h
View File

@ -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;