Commit 51b59b40 authored by Mikko Koppanen's avatar Mikko Koppanen

Fix build on windows

parent dd35385d
...@@ -41,10 +41,12 @@ zmq::address_t::~address_t () ...@@ -41,10 +41,12 @@ zmq::address_t::~address_t ()
resolved.tcp_addr = 0; resolved.tcp_addr = 0;
} }
} }
#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
else if (protocol == "ipc") { else if (protocol == "ipc") {
if (resolved.ipc_addr) { if (resolved.ipc_addr) {
delete resolved.ipc_addr; delete resolved.ipc_addr;
resolved.ipc_addr = 0; resolved.ipc_addr = 0;
} }
} }
#endif
} }
...@@ -26,8 +26,9 @@ ...@@ -26,8 +26,9 @@
namespace zmq namespace zmq
{ {
class tcp_address_t; class tcp_address_t;
#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
class ipc_address_t; class ipc_address_t;
#endif
struct address_t { struct address_t {
address_t (const std::string &protocol_, const std::string &address_); address_t (const std::string &protocol_, const std::string &address_);
...@@ -39,10 +40,11 @@ namespace zmq ...@@ -39,10 +40,11 @@ namespace zmq
// Protocol specific resolved address // Protocol specific resolved address
union { union {
tcp_address_t *tcp_addr; tcp_address_t *tcp_addr;
#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
ipc_address_t *ipc_addr; ipc_address_t *ipc_addr;
#endif
} resolved; } resolved;
}; };
} }
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment