Skip to content

Commit

Permalink
Fix MinGW compilation when --enable-vnc-jpeg is specified
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
roytam1 authored and blueswirl committed Jun 26, 2011
1 parent f44c996 commit f26e428
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions ui/vnc-enc-tight.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -36,8 +41,6 @@
#include <jpeglib.h>
#endif

#include "qemu-common.h"

#include "bswap.h"
#include "qint.h"
#include "vnc.h"
Expand Down

0 comments on commit f26e428

Please sign in to comment.