Commit 33419425 authored by Joe Eli McIlvain's avatar Joe Eli McIlvain

Problem: Private/internal macros defined in public header.

Solution: Move the macros to a private header.
parent 735c02ed
......@@ -511,19 +511,6 @@ ZMQ_EXPORT void *zmq_threadstart (zmq_thread_fn* func, void* arg);
ZMQ_EXPORT void zmq_threadclose (void* thread);
/******************************************************************************/
/* 0MQ Internal Use */
/******************************************************************************/
#define LIBZMQ_UNUSED(object) (void)object
#define LIBZMQ_DELETE(p_object) {\
delete p_object; \
p_object = 0; \
}
/******************************************************************************/
#undef ZMQ_EXPORT
#ifdef __cplusplus
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "platform.hpp"
#include "address.hpp"
#include "err.hpp"
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "client.hpp"
#include "err.hpp"
#include "msg.hpp"
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "platform.hpp"
#ifdef ZMQ_HAVE_WINDOWS
#include "windows.hpp"
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "dealer.hpp"
#include "err.hpp"
#include "msg.hpp"
......
......@@ -37,6 +37,7 @@
#include <algorithm>
#include <new>
#include "macros.hpp"
#include "epoll.hpp"
#include "err.hpp"
#include "config.hpp"
......
......@@ -29,6 +29,7 @@
#include <new>
#include "macros.hpp"
#include "io_thread.hpp"
#include "platform.hpp"
#include "err.hpp"
......
......@@ -38,6 +38,7 @@
#include <algorithm>
#include <new>
#include "macros.hpp"
#include "kqueue.hpp"
#include "err.hpp"
#include "config.hpp"
......
/******************************************************************************/
/* 0MQ Internal Use */
/******************************************************************************/
#define LIBZMQ_UNUSED(object) (void)object
#define LIBZMQ_DELETE(p_object) {\
delete p_object; \
p_object = 0; \
}
/******************************************************************************/
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "msg.hpp"
#include "../include/zmq.h"
......
......@@ -32,6 +32,7 @@
#include <new>
#include <algorithm>
#include "macros.hpp"
#include "platform.hpp"
#if defined ZMQ_HAVE_WINDOWS
#include "windows.hpp"
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "pair.hpp"
#include "err.hpp"
#include "pipe.hpp"
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "platform.hpp"
#if defined ZMQ_HAVE_OPENPGM
......
......@@ -30,6 +30,7 @@
#include <new>
#include <stddef.h>
#include "macros.hpp"
#include "pipe.hpp"
#include "err.hpp"
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "pull.hpp"
#include "err.hpp"
#include "msg.hpp"
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "push.hpp"
#include "pipe.hpp"
#include "err.hpp"
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "reaper.hpp"
#include "socket_base.hpp"
#include "err.hpp"
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "router.hpp"
#include "pipe.hpp"
#include "wire.hpp"
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "server.hpp"
#include "pipe.hpp"
#include "wire.hpp"
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "session_base.hpp"
#include "i_engine.hpp"
#include "err.hpp"
......
......@@ -31,6 +31,7 @@
#include <string>
#include <algorithm>
#include "macros.hpp"
#include "platform.hpp"
#if defined ZMQ_HAVE_WINDOWS
......
......@@ -30,6 +30,7 @@
#include <new>
#include <string>
#include "macros.hpp"
#include "socks_connecter.hpp"
#include "stream_engine.hpp"
#include "platform.hpp"
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "stream.hpp"
#include "pipe.hpp"
#include "wire.hpp"
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "platform.hpp"
#if defined ZMQ_HAVE_WINDOWS
#include "windows.hpp"
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "ip.hpp"
#include "tcp.hpp"
#include "err.hpp"
......
......@@ -30,6 +30,7 @@
#include <string>
#include <sstream>
#include "macros.hpp"
#include "tcp_address.hpp"
#include "platform.hpp"
#include "stdint.hpp"
......
......@@ -30,6 +30,7 @@
#include <new>
#include <string>
#include "macros.hpp"
#include "tcp_connecter.hpp"
#include "stream_engine.hpp"
#include "io_thread.hpp"
......
......@@ -32,6 +32,7 @@
#include <new>
#include <algorithm>
#include "macros.hpp"
#include "platform.hpp"
#if defined ZMQ_HAVE_WINDOWS
#include "windows.hpp"
......
......@@ -29,6 +29,7 @@
#include <string.h>
#include "macros.hpp"
#include "xsub.hpp"
#include "err.hpp"
......
......@@ -28,6 +28,7 @@
*/
#define ZMQ_TYPE_UNSAFE
#include "macros.hpp"
#include "poller.hpp"
// On AIX platform, poll.h has to be included first to get consistent
......
......@@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "macros.hpp"
#include "platform.hpp"
#include "clock.hpp"
......
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