From e7ca6139d062c37cc7c056b6647097e999b714cd Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 14 Dec 2001 19:25:48 +0000 Subject: [PATCH] don't include windows.h unless neccessary git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/imagjpeg.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index b6f960afdc..2f5cd0a432 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -32,14 +32,10 @@ // 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. -// -// TODO: include windows.h for MetroWerks and Watcom only after 2.3.2 release! -#if defined(__WXMSW__) - #if defined(__MWERKS__) || defined(__WATCOMC__) - #define HAVE_BOOLEAN - #endif +#if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__WATCOMC__)) + #define HAVE_BOOLEAN #include -#endif // __WXMSW__ +#endif extern "C" { -- 2.50.0