X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=libeap%2Fsrc%2Futils%2Fcommon.h;h=2868df79ffcfe0bd15bd9ef609a28bda66ecefa9;hb=d81b9e4605c7bd3da62f3679effe124778592b13;hp=96ff59c002050aedc75f62936c6d8f6f7e428b0e;hpb=a1e95d663ffdd950ced493e84f8bf5453c858bd8;p=mech_eap.git

diff --git a/libeap/src/utils/common.h b/libeap/src/utils/common.h
index 96ff59c..2868df7 100644
--- a/libeap/src/utils/common.h
+++ b/libeap/src/utils/common.h
@@ -76,7 +76,12 @@ static inline unsigned int bswap_32(unsigned int v)
 #endif /* __SYMBIAN32__ */
 
 #ifdef CONFIG_NATIVE_WINDOWS
+#ifdef CONFIG_IPV6
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
 #include <winsock.h>
+#endif
 
 typedef int socklen_t;
 
@@ -87,7 +92,9 @@ typedef int socklen_t;
 #endif /* CONFIG_NATIVE_WINDOWS */
 
 #ifdef _MSC_VER
+#ifndef __cplusplus
 #define inline __inline
+#endif
 
 #undef vsnprintf
 #define vsnprintf _vsnprintf