EAP Channel binding support

[mech_eap.git] / libeap / src / utils / common.h

diff --git a/libeap/src/utils/common.h b/libeap/src/utils/common.h
index 96ff59c..2868df7 100644 (file)
--- 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