Merge pull request #1946 from somdoron/master

problem: no way to enable draft on windows

builds/msvc/configure.bat

@@ -25,5 +25,18 @@ IF EXIST "..\..\..\libsodium" (
     ECHO #undef HAVE_LIBSODIUM>> platform.hpp
 )
 
+:-  Check if we want to build the draft API
+if "%1" == "--enable-drafts" goto :with_draft
+if "%1" == "--disable-drafts" goto :no_draft
+IF NOT EXIST "..\..\.git" GOTO no_draft
+:with_draft
+    ECHO Building with draft API (stable + legacy + draft API)
+    ECHO //  Provide draft classes and methods>>platform.hpp
+    ECHO #define ZMQ_BUILD_DRAFT_API 1>>platform.hpp
+    GOTO end_draft
+:no_draft
+    ECHO Building without draft API (stable + legacy API)
+    ECHO #undef ZMQ_BUILD_DRAFT_API 1>>platform.hpp
+:end_draft
 ECHO. >> platform.hpp
 ECHO #endif>> platform.hpp

include/zmq.h

@@ -237,11 +237,6 @@ ZMQ_EXPORT int zmq_msg_more (zmq_msg_t *msg);
 ZMQ_EXPORT int zmq_msg_get (zmq_msg_t *msg, int property);
 ZMQ_EXPORT int zmq_msg_set (zmq_msg_t *msg, int property, int optval);
 ZMQ_EXPORT const char *zmq_msg_gets (zmq_msg_t *msg, const char *property);
-ZMQ_EXPORT int zmq_msg_set_routing_id (zmq_msg_t *msg, uint32_t routing_id);
-ZMQ_EXPORT uint32_t zmq_msg_routing_id (zmq_msg_t *msg);
-ZMQ_EXPORT int zmq_msg_set_group (zmq_msg_t *msg, const char *group);
-ZMQ_EXPORT const char *zmq_msg_group (zmq_msg_t *msg);
-
 
 /******************************************************************************/
 /*  0MQ socket definition.                                                    */
@@ -530,10 +525,16 @@ ZMQ_EXPORT void zmq_threadclose (void* thread);
 #define ZMQ_GATHER 16
 #define ZMQ_SCATTER 17
 
-/*  DRAFT Socket events.                                                      */
+/*  DRAFT Socket methods.                                                     */
 ZMQ_EXPORT int zmq_join (void *s, const char *group);
 ZMQ_EXPORT int zmq_leave (void *s, const char *group);
 
+/*  DRAFT Msg methods.                                                        */
+ZMQ_EXPORT int zmq_msg_set_routing_id(zmq_msg_t *msg, uint32_t routing_id);
+ZMQ_EXPORT uint32_t zmq_msg_routing_id(zmq_msg_t *msg);
+ZMQ_EXPORT int zmq_msg_set_group(zmq_msg_t *msg, const char *group);
+ZMQ_EXPORT const char *zmq_msg_group(zmq_msg_t *msg);
+
 /******************************************************************************/
 /*  Poller polling on sockets,fd and thread-safe sockets                      */
 /******************************************************************************/

src/precompiled.hpp

@@ -160,10 +160,16 @@
 #define ZMQ_GATHER 16
 #define ZMQ_SCATTER 17
 
-/*  DRAFT Socket events.                                                      */
+/*  DRAFT Socket methods.                                                     */
 int zmq_join (void *s, const char *group);
 int zmq_leave (void *s, const char *group);
 
+/*  DRAFT Msg methods.                                                        */
+int zmq_msg_set_routing_id(zmq_msg_t *msg, uint32_t routing_id);
+uint32_t zmq_msg_routing_id(zmq_msg_t *msg);
+int zmq_msg_set_group(zmq_msg_t *msg, const char *group);
+const char *zmq_msg_group(zmq_msg_t *msg);
+
 /******************************************************************************/
 /*  Poller polling on sockets,fd and thread-safe sockets                      */
 /******************************************************************************/