From 63d1001802be7724b6d99db028d926eb630b16ee Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Mon, 2 Nov 1998 19:01:46 +0000 Subject: [PATCH] wrapping winfe-specific code with ifdefs so mac will compile. --- xpfe/xpviewer/src/nsBrowserMain.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xpfe/xpviewer/src/nsBrowserMain.cpp b/xpfe/xpviewer/src/nsBrowserMain.cpp index 673fbad171b..5fc33afe0de 100644 --- a/xpfe/xpviewer/src/nsBrowserMain.cpp +++ b/xpfe/xpviewer/src/nsBrowserMain.cpp @@ -16,15 +16,20 @@ * Corporation. Portions created by Netscape are Copyright (C) 1998 * Netscape Communications Corporation. All Rights Reserved. */ +#ifdef XP_WIN #include +#include "JSConsole.h" +#endif #include "nsViewerApp.h" #include "nsBrowserWindow.h" #include "nsITimer.h" -#include "JSConsole.h" #include "plevent.h" +#ifdef XP_WIN JSConsole *gConsole; HINSTANCE gInstance, gPrevInstance; +#endif + static nsITimer* gNetTimer; /*nsNativeViewerApp::nsNativeViewerApp() @@ -90,7 +95,9 @@ nsNativeBrowserWindow::DispatchMenuItem(PRInt32 aID) int main(int argc, char **argv) { +#ifdef XP_WIN PL_InitializeEventsLib(""); +#endif nsViewerApp* app = new nsViewerApp(); NS_ADDREF(app); app->Initialize(argc, argv); @@ -101,6 +108,7 @@ int main(int argc, char **argv) return 0; } +#ifdef XP_WIN int PASCAL WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParam, int nCmdShow) @@ -116,3 +124,4 @@ WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParam, delete app; return result; } +#endif \ No newline at end of file