From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Tue, 7 Nov 2006 14:51:52 +0000 (+0000)
Subject: Adjustement to OW 1.6-rc2 state.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e9c2213ed7185e296d58b19c3e6ea278c9459e5e

Adjustement to OW 1.6-rc2 state.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index 31e069e53a..0111e42ce1 100644
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -27,11 +27,12 @@
 #endif
 
 // NB: Some compilers define boolean type in Windows headers
-//     (e.g. Watcom C++, but not Open Watcom).
+//     (e.g. Watcom C++, but not some Open Watcom versions).
 //     This causes a conflict with jmorecfg.h header from libjpeg, so we have
 //     to make sure libjpeg won't try to define boolean itself. This is done by
 //     defining HAVE_BOOLEAN.
-#if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__DIGITALMARS__))
+#if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__DIGITALMARS__) || \
+       (defined(__WATCOMC__) && !wxONLY_WATCOM_EARLIER_THAN(1,6)))
     #define HAVE_BOOLEAN
     #include "wx/msw/wrapwin.h"
 #endif