[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-trivial] [Qemu-devel] [PATCH] w32: include winsock2.h before w
From: |
Daniel P. Berrange |
Subject: |
Re: [Qemu-trivial] [Qemu-devel] [PATCH] w32: include winsock2.h before windows.h |
Date: |
Tue, 9 Feb 2016 14:21:21 +0000 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
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 <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
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 :|