From 7d87ee1cc2f2ddce2bfa5d7e883f84e3b305e983 Mon Sep 17 00:00:00 2001
From: "mkaply%us.ibm.com"
 <mkaply%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 25 Jul 2005 20:59:23 +0000
Subject: [PATCH] OS/2 build bustage

git-svn-id: svn://10.0.0.236/trunk@176558 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/embedding/tests/os2Embed/os2Embed.cpp | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/mozilla/embedding/tests/os2Embed/os2Embed.cpp b/mozilla/embedding/tests/os2Embed/os2Embed.cpp
index 0911c77f26a..61542c50c6e 100644
--- a/mozilla/embedding/tests/os2Embed/os2Embed.cpp
+++ b/mozilla/embedding/tests/os2Embed/os2Embed.cpp
@@ -59,6 +59,7 @@
 #include "WebBrowserChrome.h"
 #include "WindowCreator.h"
 #include "resource.h"
+#include "nsStaticComponents.h"
 
 // Printing header files
 #include "nsIPrintSettings.h"
@@ -66,12 +67,11 @@
 
 #define MAX_LOADSTRING 100
 
-#ifdef _BUILD_STATIC_BIN
-#include "nsStaticComponent.h"
-nsresult PR_CALLBACK
-app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count);
-#endif
 
+#ifndef _BUILD_STATIC_BIN
+nsStaticModuleInfo const *const kPStaticModules = nsnull;
+PRUint32 const kStaticModuleCount = 0;
+#endif
 
 const CHAR *szWindowClass = "OS2EMBED";
 
@@ -156,13 +156,8 @@ int main(int argc, char *argv[])
     WinLoadString((HAB)0, ghInstanceResources, IDS_APP_TITLE, MAX_LOADSTRING, szTitle);
     MyRegisterClass();
 
-#ifdef _BUILD_STATIC_BIN
-    // Initialize XPCOM's module info table
-    NSGetStaticModuleInfo = app_getModuleInfo;
-#endif
-
     // Init Embedding APIs
-    NS_InitEmbedding(nsnull, nsnull);
+    NS_InitEmbedding(nsnull, nsnull, kPStaticModules, kStaticModuleCount);
 
     // Choose the new profile
     if (!ChooseNewProfile(TRUE, szDefaultProfile))