[Spice-devel] [PATCH 03/11] client: mingw32 build needs the jpeg_boolean define

[Alon Levy]

---
 client/jpeg_decoder.cpp  |    2 +-
 client/jpeg_decoder.h    |    2 +-
 client/mjpeg_decoder.cpp |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/jpeg_decoder.cpp b/client/jpeg_decoder.cpp
index 4bc4f18..19d22e3 100644
--- a/client/jpeg_decoder.cpp
+++ b/client/jpeg_decoder.cpp
@@ -23,7 +23,7 @@
 #include "debug.h"
 #include "utils.h"
 
-#if !defined(jpeg_boolean) && !defined(__MINGW32__)
+#if !defined(jpeg_boolean)
 #define jpeg_boolean boolean
 #endif
 
diff --git a/client/jpeg_decoder.h b/client/jpeg_decoder.h
index 34aa336..45d75d7 100644
--- a/client/jpeg_decoder.h
+++ b/client/jpeg_decoder.h
@@ -22,7 +22,7 @@
 #include "common.h"
 #include "red_canvas_base.h"
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(__MINGW32__)
 /* We need some hacks to avoid warnings from the jpeg headers */
 #define XMD_H
 #undef FAR
diff --git a/client/mjpeg_decoder.cpp b/client/mjpeg_decoder.cpp
index 0ac6eae..28d4f08 100644
--- a/client/mjpeg_decoder.cpp
+++ b/client/mjpeg_decoder.cpp
@@ -24,7 +24,7 @@
 #include "utils.h"
 #include "mjpeg_decoder.h"
 
-#if !defined(jpeg_boolean) && !defined(__MINGW32__)
+#if !defined(jpeg_boolean)
 #define jpeg_boolean boolean
 #endif
 
-- 
1.7.8.2