Patch from mkaply for building Phoenix on OS/2 (bug 171037).

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

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 \

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);