-
Notifications
You must be signed in to change notification settings - Fork 35.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Currently one Windows related fixup: * The CMake WIN32_WINNT autodetection is broken, and must be set manually. We may want to set is explicitly in any case, but the brokenness should also be fixed upstream Co-authored-by: fanquake <fanquake@gmail.com>
- Loading branch information
Showing
2 changed files
with
75 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
commit b163fc36a48ecdc87a3ecb4c6bba5f6b8965acaf | ||
Author: Stephan Lachnit <stephanlachnit@debian.org> | ||
Date: Tue Apr 23 16:02:59 2024 +0200 | ||
|
||
Do not use _MSC_VER if windows | ||
|
||
This fixes several instances where _MSC_VER was used to determine whether to use afunix.h or not. For example, MinGW requires the use of afunix.h but does not define _MSC_VER. The correct behavior is checking ZMQ_HAVE_WINDOWS. | ||
|
||
Signed-off-by: Stephan Lachnit <stephanlachnit@debian.org> | ||
|
||
diff --git a/src/ipc_address.hpp b/src/ipc_address.hpp | ||
index 422c2711..87f1245b 100644 | ||
--- a/src/ipc_address.hpp | ||
+++ b/src/ipc_address.hpp | ||
@@ -7,7 +7,7 @@ | ||
|
||
#include <string> | ||
|
||
-#if defined _MSC_VER | ||
+#if defined ZMQ_HAVE_WINDOWS | ||
#include <afunix.h> | ||
#else | ||
#include <sys/socket.h> | ||
diff --git a/src/ipc_connecter.cpp b/src/ipc_connecter.cpp | ||
index 3f988745..ed2a0645 100644 | ||
--- a/src/ipc_connecter.cpp | ||
+++ b/src/ipc_connecter.cpp | ||
@@ -16,7 +16,7 @@ | ||
#include "ipc_address.hpp" | ||
#include "session_base.hpp" | ||
|
||
-#ifdef _MSC_VER | ||
+#if defined ZMQ_HAVE_WINDOWS | ||
#include <afunix.h> | ||
#else | ||
#include <unistd.h> | ||
diff --git a/src/ipc_listener.cpp b/src/ipc_listener.cpp | ||
index 50126040..5428579b 100644 | ||
--- a/src/ipc_listener.cpp | ||
+++ b/src/ipc_listener.cpp | ||
@@ -17,7 +17,7 @@ | ||
#include "socket_base.hpp" | ||
#include "address.hpp" | ||
|
||
-#ifdef _MSC_VER | ||
+#ifdef ZMQ_HAVE_WINDOWS | ||
#ifdef ZMQ_IOTHREAD_POLLER_USE_SELECT | ||
#error On Windows, IPC does not work with POLLER=select, use POLLER=epoll instead, or disable IPC transport | ||
#endif | ||
diff --git a/tests/testutil.cpp b/tests/testutil.cpp | ||
index bdc80283..6f21e8f6 100644 | ||
--- a/tests/testutil.cpp | ||
+++ b/tests/testutil.cpp | ||
@@ -7,7 +7,7 @@ | ||
|
||
#if defined _WIN32 | ||
#include "../src/windows.hpp" | ||
-#if defined _MSC_VER | ||
+#if defined ZMQ_HAVE_WINDOWS | ||
#if defined ZMQ_HAVE_IPC | ||
#include <direct.h> | ||
#include <afunix.h> |