Commit ba1be965 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Samuel Thibault
Browse files

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: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
parent 35ee75f3

slirp/slirp.h

+11 −11
Original line number Diff line number Diff line
@@ -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,18 +28,9 @@ 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>

#endif