Merge pull request #972 from mditzel/master

Fix issue #971

Merge pull request #972 from mditzel/master
Fix issue #971
6409c0ec · Pieter Hintjens · d40580c3 · 802d1bcb · 6409c0ec
Commit 6409c0ec authored Apr 14, 2014 by Pieter Hintjens
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

windows.hpp src/windows.hpp +2 -1

No files found.
--- a/src/windows.hpp
+++ b/src/windows.hpp
@@ -50,7 +50,8 @@
 #endif

 //  Workaround missing Mstcpip.h in mingw32 (MinGW64 provides this)
-#if defined __MINGW32__ && !defined SIO_KEEPALIVE_VALS && !defined __MINGW64__
+//  __MINGW64_VERSION_MAJOR is only defined when using in mingw-w64
+#if defined __MINGW32__ && !defined SIO_KEEPALIVE_VALS && !defined __MINGW64_VERSION_MAJOR
 struct tcp_keepalive {
    u_long onoff;
    u_long keepalivetime;