From: Michael Tokarev <mjt@tls.msk.ru>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>,
Michael Tokarev <mjt@tls.msk.ru>
Subject: [Qemu-devel] [PULL 14/14] w32: include winsock2.h before windows.h
Date: Thu, 11 Feb 2016 15:19:03 +0300 [thread overview]
Message-ID: <1834ed3afc578b8dbf39838cfdf27d457771a334.1455192968.git.mjt@msgid.tls.msk.ru> (raw)
In-Reply-To: <cover.1455192968.git.mjt@msgid.tls.msk.ru>
From: Paolo Bonzini <pbonzini@redhat.com>
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.
Stefan Weil:
Without that patch, windows.h will include winsock.h
(which conflicts with winsock2.h) when compiling sdl.c.
Normally we define WIN32_LEAN_AND_MEAN, and
windows.h won't include winsock.h.
include/ui/sdl2.h and ui/sdl.c undefine that macro,
so the order of the include files is important.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
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
--
2.1.4
next prev parent reply other threads:[~2016-02-11 12:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-11 12:18 [Qemu-devel] [PULL 00/14] Trivial patches for 2016-02-11 Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 01/14] remove libtool support Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 02/14] man: virtfs-proxy-helper: Rework awkward sentence Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 03/14] qom: Correct object_property_get_int() description Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 04/14] cpu: cpu_save/cpu_load is no more Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 05/14] qemu-sockets: simplify error handling Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 06/14] rdma: remove check on time_spent when calculating mbs Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 07/14] qmp-spec: fix index in doc Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 08/14] char: fix parameter name / type in BSD codepath Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 09/14] ES1370: QOMify Michael Tokarev
2016-02-11 12:18 ` [Qemu-devel] [PULL 10/14] Emulated CCID card: QOMify Michael Tokarev
2016-02-11 12:19 ` [Qemu-devel] [PULL 11/14] Passthru " Michael Tokarev
2016-02-11 12:19 ` [Qemu-devel] [PULL 12/14] s390x: remove s390-zipl.rom Michael Tokarev
2016-02-11 12:19 ` [Qemu-devel] [PULL 13/14] Adds keycode 86 to the hid_usage_keys translation table Michael Tokarev
2016-02-11 12:19 ` Michael Tokarev [this message]
2016-02-11 17:08 ` [Qemu-devel] [PULL 00/14] Trivial patches for 2016-02-11 Peter Maydell
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=1834ed3afc578b8dbf39838cfdf27d457771a334.1455192968.git.mjt@msgid.tls.msk.ru \
--to=mjt@tls.msk.ru \
--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).