From cb69afe081994cc75654d5813981172fa194f86f Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sat, 8 Dec 2001 23:25:35 +0000
Subject: [PATCH] compilation fix for Watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/common/imagjpeg.cpp | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index b6785c33f3..b6f960afdc 100644
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -27,10 +27,25 @@
#include "wx/debug.h"
#include "wx/log.h"
#include "wx/app.h"
+
+// NB: Some compilers define boolean type in Windows headers (e.g. Watcom C++).
+// 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
+ #include <windows.h>
+#endif // __WXMSW__
+
extern "C"
{
#include "jpeglib.h"
}
+
#include "wx/filefn.h"
#include "wx/wfstream.h"
#include "wx/intl.h"
@@ -47,10 +62,6 @@ extern "C"
#endif
#endif
-#ifdef __WXMSW__
-#include <windows.h>
-#endif
-
//-----------------------------------------------------------------------------
// wxJPEGHandler
//-----------------------------------------------------------------------------
--
2.47.2