[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/14] w32: include winsock2.h before windows.h
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 14/14] w32: include winsock2.h before windows.h |
Date: |
Thu, 11 Feb 2016 15:19:03 +0300 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Reviewed-by: Stefan Weil <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
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
- [Qemu-devel] [PULL 00/14] Trivial patches for 2016-02-11, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 11/14] Passthru CCID card: QOMify, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 07/14] qmp-spec: fix index in doc, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 03/14] qom: Correct object_property_get_int() description, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 12/14] s390x: remove s390-zipl.rom, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 08/14] char: fix parameter name / type in BSD codepath, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 02/14] man: virtfs-proxy-helper: Rework awkward sentence, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 13/14] Adds keycode 86 to the hid_usage_keys translation table., Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 14/14] w32: include winsock2.h before windows.h,
Michael Tokarev <=
- [Qemu-devel] [PULL 05/14] qemu-sockets: simplify error handling, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 06/14] rdma: remove check on time_spent when calculating mbs, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 10/14] Emulated CCID card: QOMify, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 04/14] cpu: cpu_save/cpu_load is no more, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 01/14] remove libtool support, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 09/14] ES1370: QOMify, Michael Tokarev, 2016/02/11
- Re: [Qemu-devel] [PULL 00/14] Trivial patches for 2016-02-11, Peter Maydell, 2016/02/11