Re: [Qemu-devel] [PATCH] w32: include winsock2.h before windows.h

2016-02-10 Thread Michael Tokarev
09.02.2016 17:16, 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. Applied to -trivia

Re: [Qemu-devel] [PATCH] w32: include winsock2.h before windows.h

2016-02-09 Thread Paolo Bonzini
On 09/02/2016 17:03, Stefan Weil wrote: > Reviewed-by: 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

Re: [Qemu-devel] [PATCH] w32: include winsock2.h before windows.h

2016-02-09 Thread Stefan Weil
Am 09.02.2016 um 15:16 schrieb Paolo Bonzini: > 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

Re: [Qemu-devel] [PATCH] w32: include winsock2.h before windows.h

2016-02-09 Thread Peter Maydell
On 9 February 2016 at 14:37, Paolo Bonzini wrote: > > > On 09/02/2016 15:28, Peter Maydell wrote: >> On 9 February 2016 at 14:21, Daniel P. Berrange wrote: >>> > On Tue, Feb 09, 2016 at 03:16:57PM +0100, Paolo Bonzini wrote: >>> > include/qemu/sockets.h also has windows.h included before winsock2

Re: [Qemu-devel] [PATCH] w32: include winsock2.h before windows.h

2016-02-09 Thread Paolo Bonzini
On 09/02/2016 15:28, Peter Maydell wrote: > On 9 February 2016 at 14:21, Daniel P. Berrange wrote: >> > On Tue, Feb 09, 2016 at 03:16:57PM +0100, Paolo Bonzini wrote: >> > include/qemu/sockets.h also has windows.h included before winsock2.h >> > >> > Presumably it didn't cause a failure for you

Re: [Qemu-devel] [PATCH] w32: include winsock2.h before windows.h

2016-02-09 Thread Peter Maydell
On 9 February 2016 at 14:21, Daniel P. Berrange wrote: > On Tue, Feb 09, 2016 at 03:16:57PM +0100, Paolo Bonzini wrote: > 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 osde

Re: [Qemu-devel] [PATCH] w32: include winsock2.h before windows.h

2016-02-09 Thread Daniel P. Berrange
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 o

[Qemu-devel] [PATCH] w32: include winsock2.h before windows.h

2016-02-09 Thread Paolo Bonzini
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 --- include/sysemu/os-win32.h | 2 +-