fix for digitalmars header

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

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index d1588229f99d48703fb982ad7b2161322b21972e..ccc48fe7e9475b58cab7bf2ae337a52f37d26f26 100644 (file)
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -33,7 +33,7 @@
 //     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.
 //     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(__WATCOMC__) && __WATCOMC__ < 1200))
+#if defined(__WXMSW__) && (defined(__MWERKS__) || (defined(__WATCOMC__) && __WATCOMC__ < 1200)) || (defined(__DIGITALMARS__))

     #define HAVE_BOOLEAN
     #include <windows.h>
 #endif
     #define HAVE_BOOLEAN
     #include <windows.h>
 #endif