fix windows build (#29)

* fix windows build * fix for Unix * Fix build if TLS is OFF * add OpenSSL req to ws * Fix build on Mac * fix tests for windows
2019-04-16 18:51:57 +03:00
parent d4b0839328
commit 401fc39879
12 changed files with 80 additions and 40 deletions
--- a/ixwebsocket/IXSocket.cpp
+++ b/ixwebsocket/IXSocket.cpp
@ -21,6 +21,10 @@
 #include <algorithm>
 #include <iostream>

+#ifdef min
+#undef min
+#endif
+
 namespace ix
 {
    const int Socket::kDefaultPollNoTimeout = -1; // No poll timeout by default