From 12e4ce87f18a5b6d0246b0609f0cccc01cc42c10 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Mon, 28 Feb 2000 14:51:35 +0000 Subject: [PATCH] # 25555 r= mscott@netscape.com OS/2 changes for Mozilla - add #ifdef, change #ifdef git-svn-id: svn://10.0.0.236/trunk@61784 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 8 +++++++- mozilla/webshell/src/nsWebShell.cpp | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 6d7a6ac3a0c..705a3234379 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -21,6 +21,12 @@ * Pierre Phaneuf */ +#ifdef XP_OS2_VACPP +// XXX every other file that pulls in _os2.h has no problem with HTMX there; +// this one does; the problem may lie with the order of the headers below, +// which is why this fix is here instead of in _os2.h +typedef unsigned long HMTX; +#endif #include "nsDocShell.h" #include "nsIWebShell.h" #include "nsIWebBrowserChrome.h" @@ -100,7 +106,7 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); static NS_DEFINE_CID(kCStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); -#ifdef XP_PC +#if defined(XP_PC) && !defined(XP_OS2) #include #endif diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 6d7a6ac3a0c..705a3234379 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -21,6 +21,12 @@ * Pierre Phaneuf */ +#ifdef XP_OS2_VACPP +// XXX every other file that pulls in _os2.h has no problem with HTMX there; +// this one does; the problem may lie with the order of the headers below, +// which is why this fix is here instead of in _os2.h +typedef unsigned long HMTX; +#endif #include "nsDocShell.h" #include "nsIWebShell.h" #include "nsIWebBrowserChrome.h" @@ -100,7 +106,7 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); static NS_DEFINE_CID(kCStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); -#ifdef XP_PC +#if defined(XP_PC) && !defined(XP_OS2) #include #endif