From: "Daniel P. Berrange" <berrange@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [Qemu-trivial] [Qemu-devel] [PATCH] w32: include winsock2.h before windows.h
Date: Tue, 9 Feb 2016 14:21:21 +0000 [thread overview]
Message-ID: <20160209142120.GM24614@redhat.com> (raw)
In-Reply-To: <1455027417-32278-1-git-send-email-pbonzini@redhat.com>
On Tue, Feb 09, 2016 at 03:16:57PM +0100, Paolo Bonzini wrote:
> Recent Fedora complains while compiling ui/sdl.c:
>
> /usr/x86_64-w64-mingw32/sys-root/mingw/include/winsock2.h:15:2: warning: #warning Please include winsock2.h before windows.h [-Wcpp]
>
> And with this patch we dutifully obey.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> include/sysemu/os-win32.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h
> index 400e098..fbed346 100644
> --- a/include/sysemu/os-win32.h
> +++ b/include/sysemu/os-win32.h
> @@ -26,8 +26,8 @@
> #ifndef QEMU_OS_WIN32_H
> #define QEMU_OS_WIN32_H
>
> -#include <windows.h>
> #include <winsock2.h>
> +#include <windows.h>
>
> /* Workaround for older versions of MinGW. */
> #ifndef ECONNREFUSED
include/qemu/sockets.h also has windows.h included before winsock2.h
Presumably it didn't cause a failure for you because everything using
sockets.h already pulls in osdep.h. A reason to prune sockets.h
headers perhaps.
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
next prev parent reply other threads:[~2016-02-09 14:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-09 14:16 [Qemu-trivial] [PATCH] w32: include winsock2.h before windows.h Paolo Bonzini
2016-02-09 14:21 ` Daniel P. Berrange [this message]
2016-02-09 14:28 ` [Qemu-trivial] [Qemu-devel] " Peter Maydell
2016-02-09 14:37 ` [Qemu-trivial] " Paolo Bonzini
2016-02-09 14:38 ` Peter Maydell
2016-02-09 16:03 ` [Qemu-trivial] [Qemu-devel] " Stefan Weil
2016-02-09 16:06 ` Paolo Bonzini
2016-02-11 5:56 ` [Qemu-trivial] " Michael Tokarev
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=20160209142120.GM24614@redhat.com \
--to=berrange@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/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).