Merge pull request #941 from veegee/master

Fix building on MinGW64 Windows

Merge pull request #941 from veegee/master
Fix building on MinGW64 Windows
c217ab73 · Pieter Hintjens · faacb141 · 89cbd3d2 · c217ab73
Commit c217ab73 authored Mar 20, 2014 by Pieter Hintjens
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/src/windows.hpp
+++ b/src/windows.hpp
@@ -49,8 +49,8 @@
 #include <Mstcpip.h>
 #endif

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