mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-15 06:15:43 +00:00
Bug 394272 - Mingw build error in nsDownloadManager.cpp, r=tellrob, a=mconnor
This commit is contained in:
parent
b4ba0f20f7
commit
be277a0474
@ -74,9 +74,11 @@ CPPSRCS = \
|
|||||||
nsDownloadManager.cpp \
|
nsDownloadManager.cpp \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
ifndef GNU_CXX
|
||||||
ifeq ($(OS_ARCH),WINNT)
|
ifeq ($(OS_ARCH),WINNT)
|
||||||
CPPSRCS += nsDownloadScanner.cpp
|
CPPSRCS += nsDownloadScanner.cpp
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
EXTRA_COMPONENTS = \
|
EXTRA_COMPONENTS = \
|
||||||
nsDownloadManagerUI.js \
|
nsDownloadManagerUI.js \
|
||||||
|
@ -82,8 +82,10 @@
|
|||||||
|
|
||||||
#ifdef XP_WIN
|
#ifdef XP_WIN
|
||||||
#include <shlobj.h>
|
#include <shlobj.h>
|
||||||
|
#ifndef __MINGW32__
|
||||||
#include "nsDownloadScanner.h"
|
#include "nsDownloadScanner.h"
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#define DOWNLOAD_MANAGER_BUNDLE "chrome://mozapps/locale/downloads/downloads.properties"
|
#define DOWNLOAD_MANAGER_BUNDLE "chrome://mozapps/locale/downloads/downloads.properties"
|
||||||
#define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png"
|
#define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png"
|
||||||
@ -127,7 +129,7 @@ nsDownloadManager::GetSingleton()
|
|||||||
|
|
||||||
nsDownloadManager::~nsDownloadManager()
|
nsDownloadManager::~nsDownloadManager()
|
||||||
{
|
{
|
||||||
#ifdef XP_WIN
|
#if defined(XP_WIN) and !defined(__MINGW32__)
|
||||||
delete mScanner;
|
delete mScanner;
|
||||||
#endif
|
#endif
|
||||||
gDownloadManagerService = nsnull;
|
gDownloadManagerService = nsnull;
|
||||||
@ -836,7 +838,7 @@ nsDownloadManager::Init()
|
|||||||
getter_AddRefs(mBundle));
|
getter_AddRefs(mBundle));
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
#ifdef XP_WIN
|
#if defined(XP_WIN) and !defined(__MINGW32__)
|
||||||
mScanner = new nsDownloadScanner();
|
mScanner = new nsDownloadScanner();
|
||||||
if (!mScanner)
|
if (!mScanner)
|
||||||
return NS_ERROR_OUT_OF_MEMORY;
|
return NS_ERROR_OUT_OF_MEMORY;
|
||||||
@ -1779,7 +1781,7 @@ nsDownload::SetState(DownloadState aState)
|
|||||||
// Transfers are finished, so break the reference cycle
|
// Transfers are finished, so break the reference cycle
|
||||||
Finalize();
|
Finalize();
|
||||||
break;
|
break;
|
||||||
#ifdef XP_WIN
|
#if defined(XP_WIN) and !defined(__MINGW32__)
|
||||||
case nsIDownloadManager::DOWNLOAD_SCANNING:
|
case nsIDownloadManager::DOWNLOAD_SCANNING:
|
||||||
{
|
{
|
||||||
nsresult rv = mDownloadManager->mScanner ? mDownloadManager->mScanner->ScanDownload(this) : NS_ERROR_NOT_INITIALIZED;
|
nsresult rv = mDownloadManager->mScanner ? mDownloadManager->mScanner->ScanDownload(this) : NS_ERROR_NOT_INITIALIZED;
|
||||||
@ -2083,7 +2085,7 @@ nsDownload::OnStateChange(nsIWebProgress *aWebProgress,
|
|||||||
mPercentComplete = 100;
|
mPercentComplete = 100;
|
||||||
mLastUpdate = PR_Now();
|
mLastUpdate = PR_Now();
|
||||||
|
|
||||||
#ifdef XP_WIN
|
#if defined(XP_WIN) and !defined(__MINGW32__)
|
||||||
(void)SetState(nsIDownloadManager::DOWNLOAD_SCANNING);
|
(void)SetState(nsIDownloadManager::DOWNLOAD_SCANNING);
|
||||||
#else
|
#else
|
||||||
(void)SetState(nsIDownloadManager::DOWNLOAD_FINISHED);
|
(void)SetState(nsIDownloadManager::DOWNLOAD_FINISHED);
|
||||||
|
@ -71,7 +71,7 @@ typedef PRInt16 DownloadType;
|
|||||||
|
|
||||||
class nsDownload;
|
class nsDownload;
|
||||||
|
|
||||||
#ifdef XP_WIN
|
#if defined(XP_WIN) and !defined(__MINGW32__)
|
||||||
class nsDownloadScanner;
|
class nsDownloadScanner;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -88,7 +88,7 @@ public:
|
|||||||
static nsDownloadManager *GetSingleton();
|
static nsDownloadManager *GetSingleton();
|
||||||
|
|
||||||
virtual ~nsDownloadManager();
|
virtual ~nsDownloadManager();
|
||||||
#ifdef XP_WIN
|
#if defined(XP_WIN) and !defined(__MINGW32__)
|
||||||
nsDownloadManager() : mScanner(nsnull) { };
|
nsDownloadManager() : mScanner(nsnull) { };
|
||||||
private:
|
private:
|
||||||
nsDownloadScanner *mScanner;
|
nsDownloadScanner *mScanner;
|
||||||
|
Loading…
Reference in New Issue
Block a user