X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8bdb4e9964b4ee401cae293a44ddbef87be73e2..d6f582e704041c4b133893183270d4853ea34bac:/src/common/imagjpeg.cpp diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index 2b9ba5d6d2..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__) || defined(__WINE__)) +#if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__DIGITALMARS__) || \ + (defined(__WATCOMC__) && !wxONLY_WATCOM_EARLIER_THAN(1,6))) #define HAVE_BOOLEAN #include "wx/msw/wrapwin.h" #endif