diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-01-17 15:43:46 +0400 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-02-07 15:49:08 +0200 |
| commit | ba1be965311c8a63e809a2a93d1a2a9395ddd138 (patch) | |
| tree | b81cc725599f43cc1e88830397c519772d3d0e03 | |
| parent | 35ee75f343b3deffa084ab2f2f61185d1bb88471 (diff) | |
slirp: improve windows headers inclusion
Our API usage requires Vista, set WIN32_LEAN_AND_MEAN to fix a number
of issues (winsock2.h include order for ex, which is better to include
first for legacy reasons).
While at it, group redundants #ifndef _WIN32 blocks.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
| -rw-r--r-- | slirp/slirp.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/slirp/slirp.h b/slirp/slirp.h index 8d9d72ca9d..5a830ddcb8 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -3,10 +3,19 @@ #ifdef _WIN32 +/* as defined in sdkddkver.h */ +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 /* Vista */ +#endif +/* reduces the number of implicitly included headers */ +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif + typedef char *caddr_t; -# include <windows.h> # include <winsock2.h> +# include <windows.h> # include <ws2tcpip.h> # include <sys/timeb.h> # include <iphlpapi.h> @@ -19,19 +28,10 @@ typedef char *caddr_t; #ifndef _WIN32 #include <sys/uio.h> -#endif - -#ifndef _WIN32 #include <netinet/in.h> #include <arpa/inet.h> -#endif - -#ifndef _WIN32 #include <sys/socket.h> -#endif - -#ifndef _WIN32 -# include <sys/ioctl.h> +#include <sys/ioctl.h> #endif #ifdef __APPLE__ |