Add a hack to allow an external jpeg library to still be used on

cygwin/mingw/wine now that their windows headers define a type boolean
conflicting with the jpeg headers.

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

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index c92e1153966133a7914bad6091c7f97bbb505568..86f864b7534a2ee6aa8c472efd6e788dc40f6927 100644 (file)
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -26,6 +26,22 @@
     #include "wx/module.h"
 #endif
 
+// A hack based on one from tif_jpeg.c to overcome the problem on Windows
+// of rpcndr.h defining boolean with a different type to the jpeg headers.
+// 
+// This hack is only necessary for an external jpeg library, the builtin one
+// usually used on Windows doesn't use the type boolean, so always works.
+//
+#if defined wxHACK_BOOLEAN || defined __RPCNDR_H__ || defined __WINE_RPCNDR_H
+    #define HAVE_BOOLEAN
+
+    #ifdef wxHACK_BOOLEAN
+        #define boolean wxHACK_BOOLEAN
+    #else
+        #define boolean int
+    #endif
+#endif
+
 extern "C"
 {
     #if defined(__WXMSW__)

diff --git a/src/tiff/tif_jpeg.c b/src/tiff/tif_jpeg.c
index 6f3d6529206861120132aa43d7df6e117abe9974..2942823dbc4761b184b776e11ecc1a15259448e5 100644 (file)
--- a/src/tiff/tif_jpeg.c
+++ b/src/tiff/tif_jpeg.c
@@ -59,9 +59,14 @@ int TIFFFillTile(TIFF*, ttile_t);
 
    http://bugzilla.remotesensing.org/show_bug.cgi?id=188
 */
-#if defined(__RPCNDR_H__)
-#define HAVE_BOOLEAN
-#define boolean unsigned int
+#if defined wxHACK_BOOLEAN || defined __RPCNDR_H__ || defined __WINE_RPCNDR_H
+    #define HAVE_BOOLEAN
+
+    #ifdef wxHACK_BOOLEAN
+        #define boolean wxHACK_BOOLEAN
+    #else
+        #define boolean int
+    #endif
 #endif
 
 #include "jpeglib.h"