Re: [Qemu-trivial] [Qemu-devel] [PATCH] w32: Undefine error constants before their redefinition

[Stefan Weil]

Am 28.03.2012 20:56, schrieb Jan Kiszka:
> Avoids lots of warnings.
>
> Signed-off-by: Jan Kiszka <address@hidden>
> ---
> qemu_socket.h | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/qemu_socket.h b/qemu_socket.h
> index fe4cf6c..51ad210 100644
> --- a/qemu_socket.h
> +++ b/qemu_socket.h
> @@ -8,7 +8,9 @@
> #include <ws2tcpip.h>
>
> #define socket_error() WSAGetLastError()
> +#undef EWOULDBLOCK
> #undef EINTR
> +#undef EINPROGRESS
> #define EWOULDBLOCK WSAEWOULDBLOCK
> #define EINTR WSAEINTR
> #define EINPROGRESS WSAEINPROGRESS

Hi,

I am curious: with which version of MinGW or Cygwin do you get warnings?
I don't see them in my native and cross MinGW / MinGW-w64 builds.

Where do the original definitions come from, and are they compatible with
the redefined values? If yes, it might be possible to put the new 
definitions
in a conditionally compiled code block (#if !defined(EWOULDBLOCK) ... 
#endif).

Could slirp/slirp.h also use qemu_socket.h? That would simplify the code.
Is it possible to move those definitions to qemu-os-win32.h? I'd prefer
to have them in some w32 specific header file instead of qemu_socket.h and
slirp/slirp.h.

If the current two patches help you for the moment, I don't mind when they
are committed, but we should have a better solution later.

Regards,

Stefan W.