From 691bd67ff809f91e27b711b062bad282970615ec Mon Sep 17 00:00:00 2001
From: Stefan Weil <sw@weilnetz.de>
Date: Thu, 8 Apr 2021 12:27:13 +0200
Subject: [PATCH] Avoid build error caused by conflicting types for INT32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Compiler error for cross builds using mingw-w64:

In file included from /usr/share/mingw-w64/include/winnt.h:150,
                 from /usr/share/mingw-w64/include/minwindef.h:163,
                 from /usr/share/mingw-w64/include/windef.h:9,
                 from /usr/share/mingw-w64/include/windows.h:69,
                 from /usr/share/mingw-w64/include/winsock2.h:23,
                 from ../../../server/spice-core.h:29,
                 from ../../../server/spice.h:24,
                 from ../../../server/spice-wrapped.h:35,
                 from ../../../server/red-common.h:35,
                 from ../../../server/jpeg-encoder.c:22:
/usr/share/mingw-w64/include/basetsd.h:31:22: error: conflicting types for ‘INT32’
   typedef signed int INT32,*PINT32;
                      ^~~~~
In file included from /usr/x86_64-w64-mingw32/sys-root/mingw/include/jpeglib.h:31,
                 from ../../../server/jpeg-encoder.c:20:
/usr/x86_64-w64-mingw32/sys-root/mingw/include/jmorecfg.h:179:14: note: previous declaration of ‘INT32’ was here
 typedef long INT32;
              ^~~~~

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Acked-by: Frediano Ziglio <freddy77@gmail.com>
---
 AUTHORS                | 1 +
 server/jpeg-encoder.c  | 5 +++++
 server/mjpeg-encoder.c | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index f3c04a00..987a5006 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -79,5 +79,6 @@ Patches also contributed by
     Rosen Penev <rosenp@gmail.com>
     James Le Cuirot <chewi@gentoo.org>
     Frediano Ziglio <freddy77@gmail.com>
+    Stefan Weil <sw@weilnetz.de>
 
    ....send patches to get your name here...
diff --git a/server/jpeg-encoder.c b/server/jpeg-encoder.c
index 716d8d56..fee07105 100644
--- a/server/jpeg-encoder.c
+++ b/server/jpeg-encoder.c
@@ -16,6 +16,11 @@
 */
 #include <config.h>
 
+#ifdef _WIN32
+/* Avoid conflicting types for INT32 */
+#define QGLOBAL_H
+#endif
+
 #include <stdio.h>
 #include <jpeglib.h>
 
diff --git a/server/mjpeg-encoder.c b/server/mjpeg-encoder.c
index 7d2482a6..0110bba7 100644
--- a/server/mjpeg-encoder.c
+++ b/server/mjpeg-encoder.c
@@ -17,6 +17,11 @@
 */
 #include <config.h>
 
+#ifdef _WIN32
+/* Avoid conflicting types for INT32 */
+#define QGLOBAL_H
+#endif
+
 #include <stdio.h>
 #include <inttypes.h>
 #include <jerror.h>