czmq-ffi-gen 0.12.0-x86-mingw32 → 0.13.0-x86-mingw32

data/lib/czmq-ffi-gen/gem_version.rb

@@ -1,5 +1,5 @@
 module CZMQ
   module FFI
-    GEM_VERSION = "0.12.0"
+    GEM_VERSION = "0.13.0"
   end
 end

data/vendor/local/include/czmq_library.h

@@ -28,7 +28,7 @@
 //  CZMQ version macros for compile-time API detection
 #define CZMQ_VERSION_MAJOR 4
 #define CZMQ_VERSION_MINOR 0
-#define CZMQ_VERSION_PATCH 0
+#define CZMQ_VERSION_PATCH 3
 
 #define CZMQ_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))
@@ -49,8 +49,14 @@
 #   else
 #       define CZMQ_EXPORT __declspec(dllimport)
 #   endif
+#   define CZMQ_PRIVATE
 #else
 #   define CZMQ_EXPORT
+#   if (defined __GNUC__ && __GNUC__ >= 4) || defined __INTEL_COMPILER
+#       define CZMQ_PRIVATE __attribute__ ((visibility ("hidden")))
+#   else
+#       define CZMQ_PRIVATE
+#   endif
 #endif
 
 //  Opaque class structures to allow forward references

data/vendor/local/include/czmq_prelude.h

@@ -193,7 +193,7 @@
 #elif (defined (sinix))
 #   define __UTYPE_SINIX
 #   define __UNIX__
-#elif (defined (SOLARIS) || defined (__SRV4))
+#elif (defined (SOLARIS) || defined (__SVR4)) || defined (SVR4)
 #   define __UTYPE_SUNSOLARIS
 #   define __UNIX__
 #elif (defined (SUNOS) || defined (SUN) || defined (sun))
@@ -421,11 +421,17 @@ typedef struct {
 #define strneq(s1,s2)   (strcmp ((s1), (s2)))
 
 //  Provide random number from 0..(num-1)
+//  Note that (at least in Solaris) while rand() returns an int limited by
+//  RAND_MAX, random() returns a 32-bit value all filled with random bits.
 #if (defined (__WINDOWS__)) || (defined (__UTYPE_IBMAIX)) \
- || (defined (__UTYPE_HPUX)) || (defined (__UTYPE_SUNOS))
+ || (defined (__UTYPE_HPUX)) || (defined (__UTYPE_SUNOS)) || (defined (__UTYPE_SOLARIS))
 #   define randof(num)  (int) ((float) (num) * rand () / (RAND_MAX + 1.0))
 #else
-#   define randof(num)  (int) ((float) (num) * random () / (RAND_MAX + 1.0))
+# if defined(RAND_MAX)
+#   define randof(num)  (int) ((float) (num) * (random () % RAND_MAX) / (RAND_MAX + 1.0))
+# else
+#   define randof(num)  (int) ((float) (num) * (uint32_t)random () / (UINT32_MAX + 1.0))
+# endif
 #endif
 
 // Windows MSVS doesn't have stdbool

data/vendor/local/include/zhash.h

@@ -164,7 +164,8 @@ CZMQ_EXPORT int
 CZMQ_EXPORT int
     zhash_refresh (zhash_t *self);
 
-//  Set hash for automatic value destruction
+//  Set hash for automatic value destruction. Note that this assumes that
+//  values are NULL-terminated strings. Do not use with different types. 
 CZMQ_EXPORT void
     zhash_autofree (zhash_t *self);
 

data/vendor/local/include/zhashx.h

@@ -38,11 +38,11 @@ typedef void * (zhashx_duplicator_fn) (
 typedef int (zhashx_comparator_fn) (
     const void *item1, const void *item2);
 
-// compare two items, for sorting
+// Destroy an item.
 typedef void (zhashx_free_fn) (
     void *data);
 
-// compare two items, for sorting
+// Hash function for keys.
 typedef size_t (zhashx_hash_fn) (
     const void *key);
 

data/vendor/local/include/zmq.h

@@ -41,7 +41,7 @@
 /*  Version macros for compile-time API version detection                     */
 #define ZMQ_VERSION_MAJOR 4
 #define ZMQ_VERSION_MINOR 2
-#define ZMQ_VERSION_PATCH 0
+#define ZMQ_VERSION_PATCH 2
 
 #define ZMQ_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))
@@ -112,6 +112,13 @@ extern "C" {
 #   include <stdint.h>
 #endif
 
+//  32-bit AIX's pollfd struct members are called reqevents and rtnevents so it
+//  defines compatibility macros for them. Need to include that header first to
+//  stop build failures since zmq_pollset_t defines them as events and revents.
+#ifdef ZMQ_HAVE_AIX
+    #include <poll.h>
+#endif
+
 
 /******************************************************************************/
 /*  0MQ errors.                                                               */
@@ -229,10 +236,23 @@ ZMQ_EXPORT int zmq_ctx_destroy (void *context);
 /*  0MQ message definition.                                                   */
 /******************************************************************************/
 
-/* union here ensures correct alignment on architectures that require it, e.g.
- * SPARC
+/* Some architectures, like sparc64 and some variants of aarch64, enforce pointer
+ * alignment and raise sigbus on violations. Make sure applications allocate
+ * zmq_msg_t on addresses aligned on a pointer-size boundary to avoid this issue.
  */
-typedef union zmq_msg_t {unsigned char _ [64]; void *p; } zmq_msg_t;
+typedef struct zmq_msg_t {
+#if defined (__GNUC__) || defined ( __INTEL_COMPILER) || \
+        (defined (__SUNPRO_C) && __SUNPRO_C >= 0x590) || \
+        (defined (__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
+    unsigned char _ [64] __attribute__ ((aligned (sizeof (void *))));
+#elif defined (_MSC_VER) && (defined (_M_X64) || defined (_M_ARM64))
+    __declspec (align (8)) unsigned char _ [64];
+#elif defined (_MSC_VER) && (defined (_M_IX86) || defined (_M_ARM_ARMV7VE))
+    __declspec (align (4)) unsigned char _ [64];
+#else
+    unsigned char _ [64];
+#endif
+} zmq_msg_t;
 
 typedef void (zmq_free_fn) (void *data, void *hint);
 
@@ -330,8 +350,6 @@ ZMQ_EXPORT const char *zmq_msg_gets (zmq_msg_t *msg, const char *property);
 #define ZMQ_HANDSHAKE_IVL 66
 #define ZMQ_SOCKS_PROXY 68
 #define ZMQ_XPUB_NODROP 69
-//  All options after this is for version 4.2 and still *draft*
-//  Subject to arbitrary change without notice
 #define ZMQ_BLOCKY 70
 #define ZMQ_XPUB_MANUAL 71
 #define ZMQ_XPUB_WELCOME_MSG 72
@@ -543,6 +561,13 @@ ZMQ_EXPORT void zmq_threadclose (void* thread);
 #define ZMQ_SCATTER 17
 #define ZMQ_DGRAM 18
 
+/*  DRAFT 0MQ socket events and monitoring                                    */
+#define ZMQ_EVENT_HANDSHAKE_FAILED  0x0800
+#define ZMQ_EVENT_HANDSHAKE_SUCCEED 0x1000
+
+/*  DRAFT Context options                                                     */
+#define ZMQ_MSG_T_SIZE 6
+
 /*  DRAFT Socket methods.                                                     */
 ZMQ_EXPORT int zmq_join (void *s, const char *group);
 ZMQ_EXPORT int zmq_leave (void *s, const char *group);
@@ -577,6 +602,7 @@ ZMQ_EXPORT int  zmq_poller_add (void *poller, void *socket, void *user_data, sho
 ZMQ_EXPORT int  zmq_poller_modify (void *poller, void *socket, short events);
 ZMQ_EXPORT int  zmq_poller_remove (void *poller, void *socket);
 ZMQ_EXPORT int  zmq_poller_wait (void *poller, zmq_poller_event_t *event, long timeout);
+ZMQ_EXPORT int  zmq_poller_wait_all (void *poller, zmq_poller_event_t *events, int n_events, long timeout);
 
 #if defined _WIN32
 ZMQ_EXPORT int zmq_poller_add_fd (void *poller, SOCKET fd, void *user_data, short events);

data/vendor/local/include/zsock.h

@@ -299,583 +299,713 @@ CZMQ_EXPORT void *
     zsock_resolve (void *self);
 
 //  Get socket option `heartbeat_ivl`.
+//  Available from libzmq 4.2.0.      
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_heartbeat_ivl (void *self);
 
 //  Set socket option `heartbeat_ivl`.
+//  Available from libzmq 4.2.0.      
 CZMQ_EXPORT void
     zsock_set_heartbeat_ivl (void *self, int heartbeat_ivl);
 
 //  Get socket option `heartbeat_ttl`.
+//  Available from libzmq 4.2.0.      
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_heartbeat_ttl (void *self);
 
 //  Set socket option `heartbeat_ttl`.
+//  Available from libzmq 4.2.0.      
 CZMQ_EXPORT void
     zsock_set_heartbeat_ttl (void *self, int heartbeat_ttl);
 
 //  Get socket option `heartbeat_timeout`.
+//  Available from libzmq 4.2.0.          
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_heartbeat_timeout (void *self);
 
 //  Set socket option `heartbeat_timeout`.
+//  Available from libzmq 4.2.0.          
 CZMQ_EXPORT void
     zsock_set_heartbeat_timeout (void *self, int heartbeat_timeout);
 
-//  Get socket option `use_fd`.
+//  Get socket option `use_fd`. 
+//  Available from libzmq 4.2.0.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_use_fd (void *self);
 
-//  Set socket option `use_fd`.
+//  Set socket option `use_fd`. 
+//  Available from libzmq 4.2.0.
 CZMQ_EXPORT void
     zsock_set_use_fd (void *self, int use_fd);
 
 //  Set socket option `xpub_manual`.
+//  Available from libzmq 4.2.0.    
 CZMQ_EXPORT void
     zsock_set_xpub_manual (void *self, int xpub_manual);
 
 //  Set socket option `xpub_welcome_msg`.
+//  Available from libzmq 4.2.0.         
 CZMQ_EXPORT void
     zsock_set_xpub_welcome_msg (void *self, const char *xpub_welcome_msg);
 
 //  Set socket option `stream_notify`.
+//  Available from libzmq 4.2.0.      
 CZMQ_EXPORT void
     zsock_set_stream_notify (void *self, int stream_notify);
 
 //  Get socket option `invert_matching`.
+//  Available from libzmq 4.2.0.        
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_invert_matching (void *self);
 
 //  Set socket option `invert_matching`.
+//  Available from libzmq 4.2.0.        
 CZMQ_EXPORT void
     zsock_set_invert_matching (void *self, int invert_matching);
 
 //  Set socket option `xpub_verboser`.
+//  Available from libzmq 4.2.0.      
 CZMQ_EXPORT void
     zsock_set_xpub_verboser (void *self, int xpub_verboser);
 
 //  Get socket option `connect_timeout`.
+//  Available from libzmq 4.2.0.        
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_connect_timeout (void *self);
 
 //  Set socket option `connect_timeout`.
+//  Available from libzmq 4.2.0.        
 CZMQ_EXPORT void
     zsock_set_connect_timeout (void *self, int connect_timeout);
 
 //  Get socket option `tcp_maxrt`.
+//  Available from libzmq 4.2.0.  
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_tcp_maxrt (void *self);
 
 //  Set socket option `tcp_maxrt`.
+//  Available from libzmq 4.2.0.  
 CZMQ_EXPORT void
     zsock_set_tcp_maxrt (void *self, int tcp_maxrt);
 
 //  Get socket option `thread_safe`.
+//  Available from libzmq 4.2.0.    
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_thread_safe (void *self);
 
 //  Get socket option `multicast_maxtpdu`.
+//  Available from libzmq 4.2.0.          
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_multicast_maxtpdu (void *self);
 
 //  Set socket option `multicast_maxtpdu`.
+//  Available from libzmq 4.2.0.          
 CZMQ_EXPORT void
     zsock_set_multicast_maxtpdu (void *self, int multicast_maxtpdu);
 
 //  Get socket option `vmci_buffer_size`.
+//  Available from libzmq 4.2.0.         
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_vmci_buffer_size (void *self);
 
 //  Set socket option `vmci_buffer_size`.
+//  Available from libzmq 4.2.0.         
 CZMQ_EXPORT void
     zsock_set_vmci_buffer_size (void *self, int vmci_buffer_size);
 
 //  Get socket option `vmci_buffer_min_size`.
+//  Available from libzmq 4.2.0.             
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_vmci_buffer_min_size (void *self);
 
 //  Set socket option `vmci_buffer_min_size`.
+//  Available from libzmq 4.2.0.             
 CZMQ_EXPORT void
     zsock_set_vmci_buffer_min_size (void *self, int vmci_buffer_min_size);
 
 //  Get socket option `vmci_buffer_max_size`.
+//  Available from libzmq 4.2.0.             
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_vmci_buffer_max_size (void *self);
 
 //  Set socket option `vmci_buffer_max_size`.
+//  Available from libzmq 4.2.0.             
 CZMQ_EXPORT void
     zsock_set_vmci_buffer_max_size (void *self, int vmci_buffer_max_size);
 
 //  Get socket option `vmci_connect_timeout`.
+//  Available from libzmq 4.2.0.             
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_vmci_connect_timeout (void *self);
 
 //  Set socket option `vmci_connect_timeout`.
+//  Available from libzmq 4.2.0.             
 CZMQ_EXPORT void
     zsock_set_vmci_connect_timeout (void *self, int vmci_connect_timeout);
 
-//  Get socket option `tos`.
+//  Get socket option `tos`.    
+//  Available from libzmq 4.1.0.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_tos (void *self);
 
-//  Set socket option `tos`.
+//  Set socket option `tos`.    
+//  Available from libzmq 4.1.0.
 CZMQ_EXPORT void
     zsock_set_tos (void *self, int tos);
 
 //  Set socket option `router_handover`.
+//  Available from libzmq 4.1.0.        
 CZMQ_EXPORT void
     zsock_set_router_handover (void *self, int router_handover);
 
 //  Set socket option `connect_rid`.
+//  Available from libzmq 4.1.0.    
 CZMQ_EXPORT void
     zsock_set_connect_rid (void *self, const char *connect_rid);
 
 //  Set socket option `connect_rid` from 32-octet binary
+//  Available from libzmq 4.1.0.                        
 CZMQ_EXPORT void
     zsock_set_connect_rid_bin (void *self, const byte *connect_rid);
 
 //  Get socket option `handshake_ivl`.
+//  Available from libzmq 4.1.0.      
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_handshake_ivl (void *self);
 
 //  Set socket option `handshake_ivl`.
+//  Available from libzmq 4.1.0.      
 CZMQ_EXPORT void
     zsock_set_handshake_ivl (void *self, int handshake_ivl);
 
 //  Get socket option `socks_proxy`.
+//  Available from libzmq 4.1.0.    
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT char *
     zsock_socks_proxy (void *self);
 
 //  Set socket option `socks_proxy`.
+//  Available from libzmq 4.1.0.    
 CZMQ_EXPORT void
     zsock_set_socks_proxy (void *self, const char *socks_proxy);
 
 //  Set socket option `xpub_nodrop`.
+//  Available from libzmq 4.1.0.    
 CZMQ_EXPORT void
     zsock_set_xpub_nodrop (void *self, int xpub_nodrop);
 
 //  Set socket option `router_mandatory`.
+//  Available from libzmq 4.0.0.         
 CZMQ_EXPORT void
     zsock_set_router_mandatory (void *self, int router_mandatory);
 
 //  Set socket option `probe_router`.
+//  Available from libzmq 4.0.0.     
 CZMQ_EXPORT void
     zsock_set_probe_router (void *self, int probe_router);
 
 //  Set socket option `req_relaxed`.
+//  Available from libzmq 4.0.0.    
 CZMQ_EXPORT void
     zsock_set_req_relaxed (void *self, int req_relaxed);
 
 //  Set socket option `req_correlate`.
+//  Available from libzmq 4.0.0.      
 CZMQ_EXPORT void
     zsock_set_req_correlate (void *self, int req_correlate);
 
 //  Set socket option `conflate`.
+//  Available from libzmq 4.0.0. 
 CZMQ_EXPORT void
     zsock_set_conflate (void *self, int conflate);
 
 //  Get socket option `zap_domain`.
+//  Available from libzmq 4.0.0.   
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT char *
     zsock_zap_domain (void *self);
 
 //  Set socket option `zap_domain`.
+//  Available from libzmq 4.0.0.   
 CZMQ_EXPORT void
     zsock_set_zap_domain (void *self, const char *zap_domain);
 
 //  Get socket option `mechanism`.
+//  Available from libzmq 4.0.0.  
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_mechanism (void *self);
 
 //  Get socket option `plain_server`.
+//  Available from libzmq 4.0.0.     
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_plain_server (void *self);
 
 //  Set socket option `plain_server`.
+//  Available from libzmq 4.0.0.     
 CZMQ_EXPORT void
     zsock_set_plain_server (void *self, int plain_server);
 
 //  Get socket option `plain_username`.
+//  Available from libzmq 4.0.0.       
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT char *
     zsock_plain_username (void *self);
 
 //  Set socket option `plain_username`.
+//  Available from libzmq 4.0.0.       
 CZMQ_EXPORT void
     zsock_set_plain_username (void *self, const char *plain_username);
 
 //  Get socket option `plain_password`.
+//  Available from libzmq 4.0.0.       
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT char *
     zsock_plain_password (void *self);
 
 //  Set socket option `plain_password`.
+//  Available from libzmq 4.0.0.       
 CZMQ_EXPORT void
     zsock_set_plain_password (void *self, const char *plain_password);
 
 //  Get socket option `curve_server`.
+//  Available from libzmq 4.0.0.     
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_curve_server (void *self);
 
 //  Set socket option `curve_server`.
+//  Available from libzmq 4.0.0.     
 CZMQ_EXPORT void
     zsock_set_curve_server (void *self, int curve_server);
 
 //  Get socket option `curve_publickey`.
+//  Available from libzmq 4.0.0.        
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT char *
     zsock_curve_publickey (void *self);
 
 //  Set socket option `curve_publickey`.
+//  Available from libzmq 4.0.0.        
 CZMQ_EXPORT void
     zsock_set_curve_publickey (void *self, const char *curve_publickey);
 
 //  Set socket option `curve_publickey` from 32-octet binary
+//  Available from libzmq 4.0.0.                            
 CZMQ_EXPORT void
     zsock_set_curve_publickey_bin (void *self, const byte *curve_publickey);
 
 //  Get socket option `curve_secretkey`.
+//  Available from libzmq 4.0.0.        
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT char *
     zsock_curve_secretkey (void *self);
 
 //  Set socket option `curve_secretkey`.
+//  Available from libzmq 4.0.0.        
 CZMQ_EXPORT void
     zsock_set_curve_secretkey (void *self, const char *curve_secretkey);
 
 //  Set socket option `curve_secretkey` from 32-octet binary
+//  Available from libzmq 4.0.0.                            
 CZMQ_EXPORT void
     zsock_set_curve_secretkey_bin (void *self, const byte *curve_secretkey);
 
 //  Get socket option `curve_serverkey`.
+//  Available from libzmq 4.0.0.        
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT char *
     zsock_curve_serverkey (void *self);
 
 //  Set socket option `curve_serverkey`.
+//  Available from libzmq 4.0.0.        
 CZMQ_EXPORT void
     zsock_set_curve_serverkey (void *self, const char *curve_serverkey);
 
 //  Set socket option `curve_serverkey` from 32-octet binary
+//  Available from libzmq 4.0.0.                            
 CZMQ_EXPORT void
     zsock_set_curve_serverkey_bin (void *self, const byte *curve_serverkey);
 
 //  Get socket option `gssapi_server`.
+//  Available from libzmq 4.0.0.      
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_gssapi_server (void *self);
 
 //  Set socket option `gssapi_server`.
+//  Available from libzmq 4.0.0.      
 CZMQ_EXPORT void
     zsock_set_gssapi_server (void *self, int gssapi_server);
 
 //  Get socket option `gssapi_plaintext`.
+//  Available from libzmq 4.0.0.         
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_gssapi_plaintext (void *self);
 
 //  Set socket option `gssapi_plaintext`.
+//  Available from libzmq 4.0.0.         
 CZMQ_EXPORT void
     zsock_set_gssapi_plaintext (void *self, int gssapi_plaintext);
 
 //  Get socket option `gssapi_principal`.
+//  Available from libzmq 4.0.0.         
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT char *
     zsock_gssapi_principal (void *self);
 
 //  Set socket option `gssapi_principal`.
+//  Available from libzmq 4.0.0.         
 CZMQ_EXPORT void
     zsock_set_gssapi_principal (void *self, const char *gssapi_principal);
 
 //  Get socket option `gssapi_service_principal`.
+//  Available from libzmq 4.0.0.                 
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT char *
     zsock_gssapi_service_principal (void *self);
 
 //  Set socket option `gssapi_service_principal`.
+//  Available from libzmq 4.0.0.                 
 CZMQ_EXPORT void
     zsock_set_gssapi_service_principal (void *self, const char *gssapi_service_principal);
 
-//  Get socket option `ipv6`.
+//  Get socket option `ipv6`.   
+//  Available from libzmq 4.0.0.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_ipv6 (void *self);
 
-//  Set socket option `ipv6`.
+//  Set socket option `ipv6`.   
+//  Available from libzmq 4.0.0.
 CZMQ_EXPORT void
     zsock_set_ipv6 (void *self, int ipv6);
 
 //  Get socket option `immediate`.
+//  Available from libzmq 4.0.0.  
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_immediate (void *self);
 
 //  Set socket option `immediate`.
+//  Available from libzmq 4.0.0.  
 CZMQ_EXPORT void
     zsock_set_immediate (void *self, int immediate);
 
-//  Set socket option `router_raw`.
-CZMQ_EXPORT void
-    zsock_set_router_raw (void *self, int router_raw);
-
-//  Get socket option `ipv4only`.
-//  Caller owns return value and must destroy it when done.
-CZMQ_EXPORT int
-    zsock_ipv4only (void *self);
-
-//  Set socket option `ipv4only`.
-CZMQ_EXPORT void
-    zsock_set_ipv4only (void *self, int ipv4only);
-
-//  Set socket option `delay_attach_on_connect`.
-CZMQ_EXPORT void
-    zsock_set_delay_attach_on_connect (void *self, int delay_attach_on_connect);
-
-//  Get socket option `type`.
+//  Get socket option `type`.   
+//  Available from libzmq 3.0.0.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_type (void *self);
 
-//  Get socket option `sndhwm`.
+//  Get socket option `sndhwm`. 
+//  Available from libzmq 3.0.0.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_sndhwm (void *self);
 
-//  Set socket option `sndhwm`.
+//  Set socket option `sndhwm`. 
+//  Available from libzmq 3.0.0.
 CZMQ_EXPORT void
     zsock_set_sndhwm (void *self, int sndhwm);
 
-//  Get socket option `rcvhwm`.
+//  Get socket option `rcvhwm`. 
+//  Available from libzmq 3.0.0.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_rcvhwm (void *self);
 
-//  Set socket option `rcvhwm`.
+//  Set socket option `rcvhwm`. 
+//  Available from libzmq 3.0.0.
 CZMQ_EXPORT void
     zsock_set_rcvhwm (void *self, int rcvhwm);
 
 //  Get socket option `affinity`.
+//  Available from libzmq 3.0.0. 
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_affinity (void *self);
 
 //  Set socket option `affinity`.
+//  Available from libzmq 3.0.0. 
 CZMQ_EXPORT void
     zsock_set_affinity (void *self, int affinity);
 
 //  Set socket option `subscribe`.
+//  Available from libzmq 3.0.0.  
 CZMQ_EXPORT void
     zsock_set_subscribe (void *self, const char *subscribe);
 
 //  Set socket option `unsubscribe`.
+//  Available from libzmq 3.0.0.    
 CZMQ_EXPORT void
     zsock_set_unsubscribe (void *self, const char *unsubscribe);
 
 //  Get socket option `identity`.
+//  Available from libzmq 3.0.0. 
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT char *
     zsock_identity (void *self);
 
 //  Set socket option `identity`.
+//  Available from libzmq 3.0.0. 
 CZMQ_EXPORT void
     zsock_set_identity (void *self, const char *identity);
 
-//  Get socket option `rate`.
+//  Get socket option `rate`.   
+//  Available from libzmq 3.0.0.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_rate (void *self);
 
-//  Set socket option `rate`.
+//  Set socket option `rate`.   
+//  Available from libzmq 3.0.0.
 CZMQ_EXPORT void
     zsock_set_rate (void *self, int rate);
 
 //  Get socket option `recovery_ivl`.
+//  Available from libzmq 3.0.0.     
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_recovery_ivl (void *self);
 
 //  Set socket option `recovery_ivl`.
+//  Available from libzmq 3.0.0.     
 CZMQ_EXPORT void
     zsock_set_recovery_ivl (void *self, int recovery_ivl);
 
-//  Get socket option `sndbuf`.
+//  Get socket option `sndbuf`. 
+//  Available from libzmq 3.0.0.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_sndbuf (void *self);
 
-//  Set socket option `sndbuf`.
+//  Set socket option `sndbuf`. 
+//  Available from libzmq 3.0.0.
 CZMQ_EXPORT void
     zsock_set_sndbuf (void *self, int sndbuf);
 
-//  Get socket option `rcvbuf`.
+//  Get socket option `rcvbuf`. 
+//  Available from libzmq 3.0.0.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_rcvbuf (void *self);
 
-//  Set socket option `rcvbuf`.
+//  Set socket option `rcvbuf`. 
+//  Available from libzmq 3.0.0.
 CZMQ_EXPORT void
     zsock_set_rcvbuf (void *self, int rcvbuf);
 
-//  Get socket option `linger`.
+//  Get socket option `linger`. 
+//  Available from libzmq 3.0.0.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_linger (void *self);
 
-//  Set socket option `linger`.
+//  Set socket option `linger`. 
+//  Available from libzmq 3.0.0.
 CZMQ_EXPORT void
     zsock_set_linger (void *self, int linger);
 
 //  Get socket option `reconnect_ivl`.
+//  Available from libzmq 3.0.0.      
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_reconnect_ivl (void *self);
 
 //  Set socket option `reconnect_ivl`.
+//  Available from libzmq 3.0.0.      
 CZMQ_EXPORT void
     zsock_set_reconnect_ivl (void *self, int reconnect_ivl);
 
 //  Get socket option `reconnect_ivl_max`.
+//  Available from libzmq 3.0.0.          
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_reconnect_ivl_max (void *self);
 
 //  Set socket option `reconnect_ivl_max`.
+//  Available from libzmq 3.0.0.          
 CZMQ_EXPORT void
     zsock_set_reconnect_ivl_max (void *self, int reconnect_ivl_max);
 
 //  Get socket option `backlog`.
+//  Available from libzmq 3.0.0.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_backlog (void *self);
 
 //  Set socket option `backlog`.
+//  Available from libzmq 3.0.0.
 CZMQ_EXPORT void
     zsock_set_backlog (void *self, int backlog);
 
 //  Get socket option `maxmsgsize`.
+//  Available from libzmq 3.0.0.   
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_maxmsgsize (void *self);
 
 //  Set socket option `maxmsgsize`.
+//  Available from libzmq 3.0.0.   
 CZMQ_EXPORT void
     zsock_set_maxmsgsize (void *self, int maxmsgsize);
 
 //  Get socket option `multicast_hops`.
+//  Available from libzmq 3.0.0.       
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_multicast_hops (void *self);
 
 //  Set socket option `multicast_hops`.
+//  Available from libzmq 3.0.0.       
 CZMQ_EXPORT void
     zsock_set_multicast_hops (void *self, int multicast_hops);
 
 //  Get socket option `rcvtimeo`.
+//  Available from libzmq 3.0.0. 
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_rcvtimeo (void *self);
 
 //  Set socket option `rcvtimeo`.
+//  Available from libzmq 3.0.0. 
 CZMQ_EXPORT void
     zsock_set_rcvtimeo (void *self, int rcvtimeo);
 
 //  Get socket option `sndtimeo`.
+//  Available from libzmq 3.0.0. 
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_sndtimeo (void *self);
 
 //  Set socket option `sndtimeo`.
+//  Available from libzmq 3.0.0. 
 CZMQ_EXPORT void
     zsock_set_sndtimeo (void *self, int sndtimeo);
 
 //  Set socket option `xpub_verbose`.
+//  Available from libzmq 3.0.0.     
 CZMQ_EXPORT void
     zsock_set_xpub_verbose (void *self, int xpub_verbose);
 
 //  Get socket option `tcp_keepalive`.
+//  Available from libzmq 3.0.0.      
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_tcp_keepalive (void *self);
 
 //  Set socket option `tcp_keepalive`.
+//  Available from libzmq 3.0.0.      
 CZMQ_EXPORT void
     zsock_set_tcp_keepalive (void *self, int tcp_keepalive);
 
 //  Get socket option `tcp_keepalive_idle`.
+//  Available from libzmq 3.0.0.           
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_tcp_keepalive_idle (void *self);
 
 //  Set socket option `tcp_keepalive_idle`.
+//  Available from libzmq 3.0.0.           
 CZMQ_EXPORT void
     zsock_set_tcp_keepalive_idle (void *self, int tcp_keepalive_idle);
 
 //  Get socket option `tcp_keepalive_cnt`.
+//  Available from libzmq 3.0.0.          
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_tcp_keepalive_cnt (void *self);
 
 //  Set socket option `tcp_keepalive_cnt`.
+//  Available from libzmq 3.0.0.          
 CZMQ_EXPORT void
     zsock_set_tcp_keepalive_cnt (void *self, int tcp_keepalive_cnt);
 
 //  Get socket option `tcp_keepalive_intvl`.
+//  Available from libzmq 3.0.0.            
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_tcp_keepalive_intvl (void *self);
 
 //  Set socket option `tcp_keepalive_intvl`.
+//  Available from libzmq 3.0.0.            
 CZMQ_EXPORT void
     zsock_set_tcp_keepalive_intvl (void *self, int tcp_keepalive_intvl);
 
 //  Get socket option `tcp_accept_filter`.
+//  Available from libzmq 3.0.0.          
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT char *
     zsock_tcp_accept_filter (void *self);
 
 //  Set socket option `tcp_accept_filter`.
+//  Available from libzmq 3.0.0.          
 CZMQ_EXPORT void
     zsock_set_tcp_accept_filter (void *self, const char *tcp_accept_filter);
 
 //  Get socket option `rcvmore`.
+//  Available from libzmq 3.0.0.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_rcvmore (void *self);
 
-//  Get socket option `fd`.
+//  Get socket option `fd`.     
+//  Available from libzmq 3.0.0.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT SOCKET
     zsock_fd (void *self);
 
-//  Get socket option `events`.
+//  Get socket option `events`. 
+//  Available from libzmq 3.0.0.
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT int
     zsock_events (void *self);
 
 //  Get socket option `last_endpoint`.
+//  Available from libzmq 3.0.0.      
 //  Caller owns return value and must destroy it when done.
 CZMQ_EXPORT char *
     zsock_last_endpoint (void *self);
 
+//  Set socket option `router_raw`.
+//  Available from libzmq 3.0.0.   
+CZMQ_EXPORT void
+    zsock_set_router_raw (void *self, int router_raw);
+
+//  Get socket option `ipv4only`.
+//  Available from libzmq 3.0.0. 
+//  Caller owns return value and must destroy it when done.
+CZMQ_EXPORT int
+    zsock_ipv4only (void *self);
+
+//  Set socket option `ipv4only`.
+//  Available from libzmq 3.0.0. 
+CZMQ_EXPORT void
+    zsock_set_ipv4only (void *self, int ipv4only);
+
+//  Set socket option `delay_attach_on_connect`.
+//  Available from libzmq 3.0.0.                
+CZMQ_EXPORT void
+    zsock_set_delay_attach_on_connect (void *self, int delay_attach_on_connect);
+
 //  Self test of this class.
 CZMQ_EXPORT void
     zsock_test (bool verbose);
@@ -1002,6 +1132,7 @@ CZMQ_EXPORT zsock_t *
 CZMQ_EXPORT zsock_t *
     zsock_new_stream_checked (const char *endpoint, const char *filename, size_t line_nbr);
 
+#ifdef CZMQ_BUILD_DRAFT_API
 CZMQ_EXPORT zsock_t *
     zsock_new_server_checked (const char *endpoint, const char *filename, size_t line_nbr);
 
@@ -1019,6 +1150,7 @@ CZMQ_EXPORT zsock_t *
 
 CZMQ_EXPORT zsock_t *
     zsock_new_scatter_checked (const char *endpoint, const char *filename, size_t line_nbr);
+#endif // CZMQ_BUILD_DRAFT_API
 
 #ifdef __cplusplus
 }