From e75ca50f411bb0d24f6df1ed7f2c46d32cfdace1 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Thu, 10 Sep 2009 22:44:47 +0000
Subject: [PATCH] CWS-TOOLING: integrate CWS os2port06dev300 2009-09-05
 22:49:00 +0200 ydario  r275858 : #i99588# applied os2port06 diff to DEV300
 tree.

---
 np_sdk/mozsrc/makefile.mk | 2 +-
 np_sdk/mozsrc/npwin.cpp   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/np_sdk/mozsrc/makefile.mk b/np_sdk/mozsrc/makefile.mk
index 15e14a8a1dd7..e6dd7fed191f 100644
--- a/np_sdk/mozsrc/makefile.mk
+++ b/np_sdk/mozsrc/makefile.mk
@@ -43,7 +43,7 @@ JDKINCS=
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)" == "WNT"
+.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
 MOZFILES = $(SLO)$/npwin.obj
 .ELSE
 MOZFILES = $(SLO)$/npunix.obj
diff --git a/np_sdk/mozsrc/npwin.cpp b/np_sdk/mozsrc/npwin.cpp
index b8f3407aaf9d..2855290529ab 100644
--- a/np_sdk/mozsrc/npwin.cpp
+++ b/np_sdk/mozsrc/npwin.cpp
@@ -45,6 +45,12 @@
 //\\// DEFINE
 #define NP_EXPORT
 
+#ifdef OS2
+#define WINAPI _System
+#define HIBYTE(a) (a>>8)
+#define LOBYTE(a) (a&0xFF)
+#endif
+
 //\\// GLOBAL DATA
 NPNetscapeFuncs* g_pNavigatorFuncs = 0;