From 43002a197f921264f015c8ea1ac4eb5ba4800009 Mon Sep 17 00:00:00 2001
From: Walter Meinl <wuno@lsvw.de>
Date: Sat, 30 Jan 2010 07:45:56 -0500
Subject: [PATCH] Bug 536269: Fix build bustage on OS/2 in
 xpcom/build/dlldeps.cpp r=bsmedberg

---
 xpcom/build/dlldeps.cpp | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/xpcom/build/dlldeps.cpp b/xpcom/build/dlldeps.cpp
index 092607933f34..c2a7a67b5c24 100644
--- a/xpcom/build/dlldeps.cpp
+++ b/xpcom/build/dlldeps.cpp
@@ -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);