From: Stefan Hajnoczi <stefanha@gmail.com>
To: Stefan Weil <weil@mail.berlios.de>
Cc: qemu-trivial@nongnu.org, qemu-devel <qemu-devel@nongnu.org>,
Roy Tam <roytam@gmail.com>
Subject: Re: [Qemu-devel] [Qemu-trivial] [PATCH] fix MinGW compilation when --enable-vnc-jpeg is specified
Date: Thu, 23 Jun 2011 14:52:02 +0100 [thread overview]
Message-ID: <20110623135202.GA12765@stefanha-thinkpad.localdomain> (raw)
In-Reply-To: <4DFC636D.9090800@mail.berlios.de>
On Sat, Jun 18, 2011 at 10:35:57AM +0200, Stefan Weil wrote:
> Am 18.06.2011 07:13, schrieb Roy Tam:
> >This patch fix conflicting types for 'INT32' in basetsd.h in including
> >qemu-common.h first.
> >
> >
> >Sign-off-by: Roy Tam<roytam@gmail.com>
> >--
> >diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
> >index 87fdf35..1591df0 100644
> >--- a/ui/vnc-enc-tight.c
> >+++ b/ui/vnc-enc-tight.c
> >@@ -28,6 +28,8 @@
> >
> > #include "config-host.h"
> >
> >+#include "qemu-common.h"
> >+
> > #ifdef CONFIG_VNC_PNG
> > #include<png.h>
> > #endif
> >@@ -36,8 +38,6 @@
> > #include<jpeglib.h>
> > #endif
> >
> >-#include "qemu-common.h"
> >-
> > #include "bswap.h"
> > #include "qint.h"
> > #include "vnc.h"
>
> Acked-by: Stefan Weil <weil@mail.berlios.de>
>
> The conflicting declaration is in jmorecfg.h which is included from
> jpeglib.h.
Is the problem that the Windows headers included from qemu-common.h try
to #define INT32?
http://msdn.microsoft.com/en-us/library/aa383751(v=vs.85).aspx
In that case I think an explicit fix is better:
#ifdef _WIN32
/* Include this before jpeglib.h for the INT32 definition */
#include <basetsd.h>
#endif
...followed by png/jpeg includes...
Simply moving qemu-common.h provides no hints and is rather indirect.
Someone may move it back in the future.
Stefan
next prev parent reply other threads:[~2011-06-23 13:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-18 5:13 [Qemu-devel] [PATCH] fix MinGW compilation when --enable-vnc-jpeg is specified Roy Tam
2011-06-18 8:35 ` Stefan Weil
2011-06-23 13:52 ` Stefan Hajnoczi [this message]
2011-06-23 15:05 ` [Qemu-devel] [Qemu-trivial] " Stefan Weil
2011-06-24 5:30 ` Stefan Hajnoczi
2011-06-26 18:06 ` Blue Swirl
2011-06-26 20:03 ` Stefan Weil
2011-06-26 20:26 ` Blue Swirl
2011-06-27 2:37 ` TeLeMan
2011-06-27 4:15 ` Roy Tam
2011-06-27 5:40 ` Stefan Weil
2011-06-27 5:56 ` Roy Tam
2011-06-27 17:22 ` Stefan Weil
2011-06-30 15:26 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110623135202.GA12765@stefanha-thinkpad.localdomain \
--to=stefanha@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=roytam@gmail.com \
--cc=weil@mail.berlios.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).