Merge pull request #1547 from jemc/master

Problem: Private/internal macros defined in public header.

include/zmq.h

@@ -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

src/address.cpp

@@ -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"

src/client.cpp

@@ -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"

src/ctx.cpp

@@ -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"

src/dealer.cpp

@@ -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"

src/epoll.cpp

@@ -37,6 +37,7 @@
 #include <algorithm>
 #include <new>
 
+#include "macros.hpp"
 #include "epoll.hpp"
 #include "err.hpp"
 #include "config.hpp"

src/io_thread.cpp

@@ -29,6 +29,7 @@
 
 #include <new>
 
+#include "macros.hpp"
 #include "io_thread.hpp"
 #include "platform.hpp"
 #include "err.hpp"

src/kqueue.cpp

@@ -38,6 +38,7 @@
 #include <algorithm>
 #include <new>
 
+#include "macros.hpp"
 #include "kqueue.hpp"
 #include "err.hpp"
 #include "config.hpp"

src/macros.hpp

@@ -0,0 +1,12 @@
+
+/******************************************************************************/
+/*  0MQ Internal Use                                                          */
+/******************************************************************************/
+
+#define LIBZMQ_UNUSED(object) (void)object
+#define LIBZMQ_DELETE(p_object) {\
+    delete p_object; \
+    p_object = 0; \
+}
+
+/******************************************************************************/

src/msg.cpp

@@ -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"
 

src/mtrie.cpp

@@ -32,6 +32,7 @@
 #include <new>
 #include <algorithm>
 
+#include "macros.hpp"
 #include "platform.hpp"
 #if defined ZMQ_HAVE_WINDOWS
 #include "windows.hpp"

src/pair.cpp

@@ -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"

src/pgm_receiver.cpp

@@ -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

src/pipe.cpp

@@ -30,6 +30,7 @@
 #include <new>
 #include <stddef.h>
 
+#include "macros.hpp"
 #include "pipe.hpp"
 #include "err.hpp"
 

src/pull.cpp

@@ -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"

src/push.cpp

@@ -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"

src/reaper.cpp

@@ -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"

src/router.cpp

@@ -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"

src/server.cpp

@@ -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"

src/session_base.cpp

@@ -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"

src/socket_base.cpp

@@ -31,6 +31,7 @@
 #include <string>
 #include <algorithm>
 
+#include "macros.hpp"
 #include "platform.hpp"
 
 #if defined ZMQ_HAVE_WINDOWS

src/socks_connecter.cpp

@@ -30,6 +30,7 @@
 #include <new>
 #include <string>
 
+#include "macros.hpp"
 #include "socks_connecter.hpp"
 #include "stream_engine.hpp"
 #include "platform.hpp"

src/stream.cpp

@@ -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"

src/stream_engine.cpp

@@ -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"

src/tcp.cpp

@@ -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"

src/tcp_address.cpp

@@ -30,6 +30,7 @@
 #include <string>
 #include <sstream>
 
+#include "macros.hpp"
 #include "tcp_address.hpp"
 #include "platform.hpp"
 #include "stdint.hpp"

src/tcp_connecter.cpp

@@ -30,6 +30,7 @@
 #include <new>
 #include <string>
 
+#include "macros.hpp"
 #include "tcp_connecter.hpp"
 #include "stream_engine.hpp"
 #include "io_thread.hpp"

src/trie.cpp

@@ -32,6 +32,7 @@
 #include <new>
 #include <algorithm>
 
+#include "macros.hpp"
 #include "platform.hpp"
 #if defined ZMQ_HAVE_WINDOWS
 #include "windows.hpp"

src/xsub.cpp

@@ -29,6 +29,7 @@
 
 #include <string.h>
 
+#include "macros.hpp"
 #include "xsub.hpp"
 #include "err.hpp"
 

src/zmq.cpp

@@ -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

src/zmq_utils.cpp

@@ -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"