Bug 536269: Fix build bustage on OS/2 in xpcom/build/dlldeps.cpp r=bsmedberg
authorWalter Meinl <wuno@lsvw.de>
Sat, 30 Jan 2010 07:45:56 -0500
changeset 37644 bcbbe25e3ae2b5a493184aa43a8f210e25a79983
parent 37643 82747ecf81ddd2ab3d7bf55168fa49f38870ca4b
child 37645 f17cb708eab082a6ef7fe6eefd938fd9e53a3619
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs536269
milestone1.9.3a1pre
Bug 536269: Fix build bustage on OS/2 in xpcom/build/dlldeps.cpp r=bsmedberg
xpcom/build/dlldeps.cpp
--- a/xpcom/build/dlldeps.cpp
+++ b/xpcom/build/dlldeps.cpp
@@ -33,18 +33,22 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // 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"
 #include "nsTArray.h"
 #include "nsIAtom.h"
 #include "nsFixedSizeAllocator.h"
 #include "nsRecyclingAllocator.h"
 #include "nsDeque.h"
@@ -74,19 +78,16 @@
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsReadableUtils.h"
 #include "nsStaticNameTable.h"
 #include "nsProcess.h"
 #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"
 #include "nsVariant.h"
 #include "nsEscape.h"
 #include "nsStreamUtils.h"
 #include "nsNativeCharsetUtils.h"
 #include "nsInterfaceRequestorAgg.h"
@@ -98,20 +99,16 @@
 #include "nsCycleCollector.h"
 #include "nsThreadUtils.h"
 #include "nsTObserverArray.h"
 #include "nsWildCard.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/CondVar.h"
 
-#if !defined(XP_OS2)
-#include "nsWindowsRegKey.h"
-#endif
-
 using namespace mozilla;
 
 class nsCStringContainer : private nsStringContainer_base { };
 class nsStringContainer : private nsStringContainer_base { };
 
 void XXXNeverCalled()
 {
     GRE_GetGREPathWithProperties(nsnull, 0, nsnull, 0, nsnull, 0);
@@ -174,19 +171,16 @@ void XXXNeverCalled()
     nsTraceRefcnt::LogAddCOMPtr(nsnull, nsnull);
     nsTraceRefcntImpl::DumpStatistics();
     NS_NewEmptyEnumerator(nsnull);
     NS_QuickSort(nsnull, 0, 0, nsnull, nsnull);
     nsString();
     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);
     NS_GetWeakReference(nsnull);
     nsCOMPtr<nsISupports> dummyFoo(do_GetInterface(nsnull));
     NS_NewStorageStream(0,0, nsnull);
     nsString foo;
     nsPrintfCString bar("");
@@ -281,21 +275,23 @@ void XXXNeverCalled()
       nsStringBuffer::FromString(x);
       nsStringBuffer::FromString(y);
       b.ToString(0, x);
       b.ToString(0, y);
     }
 
     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);
     NS_GetCurrentThread(nsnull);
     NS_GetCurrentThread();
     NS_GetMainThread(nsnull);
     NS_DispatchToCurrentThread(nsnull);
     NS_DispatchToMainThread(nsnull, 0);