From 300d80ffe9d74fe0624b0d592e83829e921484f3 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Sat, 30 Jan 2016 03:46:46 -0500 Subject: [PATCH] rename ZMQ_UNUSED macro to LIBZMQ_UNUSED Backported from zeromq/libzmq@63260d8 # Conflicts: # include/zmq.h # src/client.cpp # src/server.cpp --- include/zmq.h | 4 ++-- src/dealer.cpp | 2 +- src/pair.cpp | 2 +- src/pull.cpp | 2 +- src/push.cpp | 2 +- src/router.cpp | 2 +- src/stream.cpp | 2 +- src/tcp.cpp | 10 +++++----- src/tcp_address.cpp | 8 ++++---- src/xsub.cpp | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/zmq.h b/include/zmq.h index 4f0af82c..3b2ec911 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -408,10 +408,10 @@ ZMQ_EXPORT uint8_t *zmq_z85_decode (uint8_t *dest, char *string); ZMQ_EXPORT int zmq_device (int type, void *frontend, void *backend); /******************************************************************************/ -/* 0MQ General */ +/* 0MQ Internal Use */ /******************************************************************************/ -#define ZMQ_UNUSED(object) (void)object +#define LIBZMQ_UNUSED(object) (void)object #undef ZMQ_EXPORT diff --git a/src/dealer.cpp b/src/dealer.cpp index 7edd461e..834eb98a 100644 --- a/src/dealer.cpp +++ b/src/dealer.cpp @@ -34,7 +34,7 @@ zmq::dealer_t::~dealer_t () void zmq::dealer_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_) { - ZMQ_UNUSED(subscribe_to_all_); + LIBZMQ_UNUSED(subscribe_to_all_); zmq_assert (pipe_); diff --git a/src/pair.cpp b/src/pair.cpp index 4113e90a..ba5daf3d 100644 --- a/src/pair.cpp +++ b/src/pair.cpp @@ -36,7 +36,7 @@ zmq::pair_t::~pair_t () void zmq::pair_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_) { - ZMQ_UNUSED(subscribe_to_all_); + LIBZMQ_UNUSED(subscribe_to_all_); zmq_assert (pipe_ != NULL); diff --git a/src/pull.cpp b/src/pull.cpp index 15620b27..4cde88e7 100644 --- a/src/pull.cpp +++ b/src/pull.cpp @@ -34,7 +34,7 @@ zmq::pull_t::~pull_t () void zmq::pull_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_) { - ZMQ_UNUSED(subscribe_to_all_); + LIBZMQ_UNUSED(subscribe_to_all_); zmq_assert (pipe_); fq.attach (pipe_); diff --git a/src/push.cpp b/src/push.cpp index 5603d100..1d70cec3 100644 --- a/src/push.cpp +++ b/src/push.cpp @@ -34,7 +34,7 @@ zmq::push_t::~push_t () void zmq::push_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_) { - ZMQ_UNUSED(subscribe_to_all_); + LIBZMQ_UNUSED(subscribe_to_all_); // Don't delay pipe termination as there is no one // to receive the delimiter. diff --git a/src/router.cpp b/src/router.cpp index a4badc0b..64e872c7 100644 --- a/src/router.cpp +++ b/src/router.cpp @@ -55,7 +55,7 @@ zmq::router_t::~router_t () void zmq::router_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_) { - ZMQ_UNUSED(subscribe_to_all_); + LIBZMQ_UNUSED(subscribe_to_all_); zmq_assert (pipe_); diff --git a/src/stream.cpp b/src/stream.cpp index b1a983b8..47d59ab3 100644 --- a/src/stream.cpp +++ b/src/stream.cpp @@ -48,7 +48,7 @@ zmq::stream_t::~stream_t () void zmq::stream_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_) { - ZMQ_UNUSED(subscribe_to_all_); + LIBZMQ_UNUSED(subscribe_to_all_); zmq_assert (pipe_); diff --git a/src/tcp.cpp b/src/tcp.cpp index cc04fa5c..b802960e 100755 --- a/src/tcp.cpp +++ b/src/tcp.cpp @@ -84,13 +84,13 @@ void zmq::set_tcp_receive_buffer (fd_t sockfd_, int bufsize_) void zmq::tune_tcp_keepalives (fd_t s_, int keepalive_, int keepalive_cnt_, int keepalive_idle_, int keepalive_intvl_) { // These options are used only under certain #ifdefs below. - ZMQ_UNUSED(keepalive_); - ZMQ_UNUSED(keepalive_cnt_); - ZMQ_UNUSED(keepalive_idle_); - ZMQ_UNUSED(keepalive_intvl_); + LIBZMQ_UNUSED(keepalive_); + LIBZMQ_UNUSED(keepalive_cnt_); + LIBZMQ_UNUSED(keepalive_idle_); + LIBZMQ_UNUSED(keepalive_intvl_); // If none of the #ifdefs apply, then s_ is unused. - ZMQ_UNUSED(s_); + LIBZMQ_UNUSED(s_); // Tuning TCP keep-alives if platform allows it // All values = -1 means skip and leave it for OS diff --git a/src/tcp_address.cpp b/src/tcp_address.cpp index eabbe7a8..1cba41d2 100644 --- a/src/tcp_address.cpp +++ b/src/tcp_address.cpp @@ -53,7 +53,7 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_) { // TODO: Unused parameter, IPv6 support not implemented for Solaris. - ZMQ_UNUSED(ipv6_); + LIBZMQ_UNUSED(ipv6_); // Create a socket. int fd = open_socket (AF_INET, SOCK_DGRAM, 0); @@ -117,7 +117,7 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_) int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_) { // TODO: Unused parameter, IPv6 support not implemented for AIX or HP/UX. - ZMQ_UNUSED(ipv6_); + LIBZMQ_UNUSED(ipv6_); // Create a socket. int sd = open_socket (AF_INET, SOCK_DGRAM, 0); @@ -195,8 +195,8 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_) // This is true especially of Windows. int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_) { - ZMQ_UNUSED(nic_); - ZMQ_UNUSED(ipv6_); + LIBZMQ_UNUSED(nic_); + LIBZMQ_UNUSED(ipv6_); errno = ENODEV; return -1; diff --git a/src/xsub.cpp b/src/xsub.cpp index 7e815d5a..d393da56 100644 --- a/src/xsub.cpp +++ b/src/xsub.cpp @@ -45,7 +45,7 @@ zmq::xsub_t::~xsub_t () void zmq::xsub_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_) { - ZMQ_UNUSED(subscribe_to_all_); + LIBZMQ_UNUSED(subscribe_to_all_); zmq_assert (pipe_); fq.attach (pipe_);