mirror of https://github.com/oxen-io/lokinet
Update mingw zmq patch
The one we were applying for closesocket breaks on some versions.pull/1942/head
parent
b8896740de
commit
c504c030cf
@ -1,12 +0,0 @@
|
|||||||
diff --git a/tests/testutil.hpp b/tests/testutil.hpp
|
|
||||||
index c6f5e4de..6a1c8bb8 100644
|
|
||||||
--- a/tests/testutil.hpp
|
|
||||||
+++ b/tests/testutil.hpp
|
|
||||||
@@ -102,7 +102,6 @@ const uint8_t zmtp_ready_sub[27] = {
|
|
||||||
#include <winsock2.h>
|
|
||||||
#include <ws2tcpip.h>
|
|
||||||
#include <stdexcept>
|
|
||||||
-#define close closesocket
|
|
||||||
typedef int socket_size_t;
|
|
||||||
inline const char *as_setsockopt_opt_t (const void *opt)
|
|
||||||
{
|
|
@ -0,0 +1,14 @@
|
|||||||
|
diff --git a/tests/testutil.hpp b/tests/testutil.hpp
|
||||||
|
index c6f5e4de78..09b9fa77e5 100644
|
||||||
|
--- a/tests/testutil.hpp
|
||||||
|
+++ b/tests/testutil.hpp
|
||||||
|
@@ -41,6 +41,9 @@
|
||||||
|
// For AF_INET and IPPROTO_TCP
|
||||||
|
#if defined _WIN32
|
||||||
|
#include "../src/windows.hpp"
|
||||||
|
+#if defined(__MINGW32__)
|
||||||
|
+#include <unistd.h>
|
||||||
|
+#endif
|
||||||
|
#else
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <unistd.h>
|
Loading…
Reference in New Issue