Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 536269: Fix build bustage on OS/2 in xpcom/build/dlldeps.cpp r=bsmedberg

Browse Source
This commit is contained in:
Walter Meinl 2010-01-30 07:45:56 -05:00
parent a15ceb88f7
commit 43002a197f
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xpcom/build/dlldeps.cpp
View File

@ -38,8 +38,12 @@
// Force references to all of the symbols that we want exported from
// the dll that are located in the .lib files we link with
#ifndef XP_OS2
#ifdef XP_WIN
#include <windows.h>
#include "nsWindowsRegKey.h"
#ifdef DEBUG
#include "pure.h"
#endif
#endif
#include "nsXPCOMGlue.h"
#include "nsVoidArray.h"
@ -79,9 +83,6 @@
#include "nsStringEnumerator.h"
#include "nsIInputStreamTee.h"
#include "nsCheapSets.h"
#if defined(DEBUG) && !defined(XP_OS2)
#include "pure.h"
#endif
#include "nsHashKeys.h"
#include "nsTHashtable.h"
#include "pldhash.h"
@ -103,10 +104,6 @@
#include "mozilla/Monitor.h"
#include "mozilla/CondVar.h"
#if !defined(XP_OS2)
#include "nsWindowsRegKey.h"
#endif
using namespace mozilla;
class nsCStringContainer : private nsStringContainer_base { };
@ -179,9 +176,6 @@ void XXXNeverCalled()
NS_ProxyRelease(nsnull, nsnull, PR_FALSE);
XPT_DoString(nsnull, nsnull, nsnull);
XPT_DoHeader(nsnull, nsnull, nsnull);
#if defined (DEBUG) && !defined (WINCE) && !defined(XP_OS2)
PurePrintf(0);
#endif
NS_InvokeByIndex(nsnull, 0, 0, nsnull);
NS_NewGenericFactory(nsnull, nsnull);
NS_NewGenericModule2(nsnull, nsnull);
@ -286,11 +280,13 @@ void XXXNeverCalled()
nsXPCOMCycleCollectionParticipant();
nsCycleCollector_collect();
#ifdef XP_WIN
sXPCOMHasLoadedNewDLLs = !sXPCOMHasLoadedNewDLLs;
NS_SetHasLoadedNewDLLs();
#if !defined(XP_OS2)
NS_NewWindowsRegKey(nsnull);
#if defined (DEBUG) && !defined (WINCE)
PurePrintf(0);
#endif
#endif
NS_NewThread(nsnull, nsnull);