From 51b59b40ddbcbde58dd45a32a449996041cb4aef Mon Sep 17 00:00:00 2001 From: Mikko Koppanen Date: Fri, 17 Feb 2012 22:06:10 +0000 Subject: [PATCH] Fix build on windows --- src/address.cpp | 2 ++ src/address.hpp | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/address.cpp b/src/address.cpp index 693c1610..a65ffa3d 100644 --- a/src/address.cpp +++ b/src/address.cpp @@ -41,10 +41,12 @@ zmq::address_t::~address_t () resolved.tcp_addr = 0; } } +#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS else if (protocol == "ipc") { if (resolved.ipc_addr) { delete resolved.ipc_addr; resolved.ipc_addr = 0; } } +#endif } diff --git a/src/address.hpp b/src/address.hpp index acb6ef10..ec6d4a28 100644 --- a/src/address.hpp +++ b/src/address.hpp @@ -26,8 +26,9 @@ namespace zmq { class tcp_address_t; +#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS class ipc_address_t; - +#endif struct address_t { address_t (const std::string &protocol_, const std::string &address_); @@ -39,10 +40,11 @@ namespace zmq // Protocol specific resolved address union { tcp_address_t *tcp_addr; +#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS ipc_address_t *ipc_addr; +#endif } resolved; }; - } #endif