From ac5439f237000e63cab960e48d1709bb4fc82667 Mon Sep 17 00:00:00 2001
From: "bryner%netscape.com" <bryner%netscape.com>
Date: Sun, 29 Sep 2002 06:51:54 +0000
Subject: [PATCH] Patch from mkaply for building Phoenix on OS/2 (bug 171037).

---
 browser/components/prefwindow/content/Makefile.in | 2 +-
 toolkit/xre/Makefile.in                           | 4 ++++
 toolkit/xre/nsXREDirProvider.h                    | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/browser/components/prefwindow/content/Makefile.in b/browser/components/prefwindow/content/Makefile.in
index 3cb5a783f5ad..ab7c732cdad9 100644
--- a/browser/components/prefwindow/content/Makefile.in
+++ b/browser/components/prefwindow/content/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(OS_ARCH),WINNT)
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 DIRS		= win
 else
 DIRS		= unix
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 67f8fe8bf14d..2cd6a7970d03 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -92,6 +92,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
 SHAREDSRCS += nsNativeAppSupportGtk.cpp
 endif
 
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+SHAREDSRCS += nsNativeAppSupportOS2.cpp
+endif
+
 CPPSRCS = \
 	$(SHAREDSRCS) \
 	nsAppRunner.cpp \
diff --git a/toolkit/xre/nsXREDirProvider.h b/toolkit/xre/nsXREDirProvider.h
index ebc12670f913..00e7365a7023 100644
--- a/toolkit/xre/nsXREDirProvider.h
+++ b/toolkit/xre/nsXREDirProvider.h
@@ -50,8 +50,8 @@ public:
   nsXREDirProvider(const nsACString& aProductName);
   virtual ~nsXREDirProvider();
 
-  NS_DECL_ISUPPORTS;
-  NS_DECL_NSIDIRECTORYSERVICEPROVIDER;
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIDIRECTORYSERVICEPROVIDER
 
 private:
   nsresult GetProductDirectory(nsILocalFile** aFile);