[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-trivial] [PULL 14/14] w32: include winsock2.h before windows.h

From: Michael Tokarev
Subject: [Qemu-trivial] [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. */

reply via email to

[Prev in Thread] Current Thread [Next in Thread]