[Spice-commits] AUTHORS server/jpeg-encoder.c server/mjpeg-encoder.c

[GitLab Mirror]

 AUTHORS                |    1 +
 server/jpeg-encoder.c  |    5 +++++
 server/mjpeg-encoder.c |    5 +++++
 3 files changed, 11 insertions(+)

New commits:
commit 691bd67ff809f91e27b711b062bad282970615ec
Author: Stefan Weil <sw at weilnetz.de>
Date:   Thu Apr 8 12:27:13 2021 +0200

    Avoid build error caused by conflicting types for INT32
    
    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 at weilnetz.de>
    Acked-by: Frediano Ziglio <freddy77 at gmail.com>

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 at gmail.com>
     James Le Cuirot <chewi at gentoo.org>
     Frediano Ziglio <freddy77 at gmail.com>
+    Stefan Weil <sw at 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>