don't include windows.h unless neccessary

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

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index b6f960afdc0c276b05fae27af898b1addd4ac09e..2f5cd0a432b3c636152079d6c346e8fe32474ff3 100644 (file)
--- 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 <windows.h>
-#endif // __WXMSW__
+#endif
 
 extern "C"
 {