aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Tam <roytam@gmail.com>2011-06-18 13:13:39 +0800
committerBlue Swirl <blauwirbel@gmail.com>2011-06-26 20:19:38 +0000
commitf26e428da505709ec03b2ed2c9eb3db82b30bd7b (patch)
tree2879deea94aecfdba0b4d830346783ff22181b70
parentf44c99607a46484c52f03aed373e3a3a194af721 (diff)
Fix MinGW compilation when --enable-vnc-jpeg is specified
Fix conflicting types for 'INT32' in basetsd.h and jmorecfg.h by including qemu-common.h first. Signed-off-by: Roy Tam <roytam@gmail.com> Acked-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--ui/vnc-enc-tight.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index 87fdf35d3e..6d36a7f7ae 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -28,6 +28,11 @@
#include "config-host.h"
+/* This needs to be before jpeglib.h line because of conflict with
+ INT32 definitions between jmorecfg.h (included by jpeglib.h) and
+ Win32 basetsd.h (included by windows.h). */
+#include "qemu-common.h"
+
#ifdef CONFIG_VNC_PNG
#include <png.h>
#endif
@@ -36,8 +41,6 @@
#include <jpeglib.h>
#endif
-#include "qemu-common.h"
-
#include "bswap.h"
#include "qint.h"
#include "vnc.h"