mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-12 10:33:52 +01:00
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>
This commit is contained in:
parent
2a75ef07be
commit
aa885c5a15
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#if defined _MSC_VER
|
#if defined ZMQ_HAVE_WINDOWS
|
||||||
#include <afunix.h>
|
#include <afunix.h>
|
||||||
#else
|
#else
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#include "ipc_address.hpp"
|
#include "ipc_address.hpp"
|
||||||
#include "session_base.hpp"
|
#include "session_base.hpp"
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#if defined ZMQ_HAVE_WINDOWS
|
||||||
#include <afunix.h>
|
#include <afunix.h>
|
||||||
#else
|
#else
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include "socket_base.hpp"
|
#include "socket_base.hpp"
|
||||||
#include "address.hpp"
|
#include "address.hpp"
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef ZMQ_HAVE_WINDOWS
|
||||||
#ifdef ZMQ_IOTHREAD_POLLER_USE_SELECT
|
#ifdef ZMQ_IOTHREAD_POLLER_USE_SELECT
|
||||||
#error On Windows, IPC does not work with POLLER=select, use POLLER=epoll instead, or disable IPC transport
|
#error On Windows, IPC does not work with POLLER=select, use POLLER=epoll instead, or disable IPC transport
|
||||||
#endif
|
#endif
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
#if defined _WIN32
|
#if defined _WIN32
|
||||||
#include "../src/windows.hpp"
|
#include "../src/windows.hpp"
|
||||||
#if defined _MSC_VER
|
#if defined ZMQ_HAVE_WINDOWS
|
||||||
#if defined ZMQ_HAVE_IPC
|
#if defined ZMQ_HAVE_IPC
|
||||||
#include <direct.h>
|
#include <direct.h>
|
||||||
#include <afunix.h>
|
#include <afunix.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user