Add missing zmq.DONTWAIT constant for zmq 3.1 support.

For forwards & backward compatibility define both DONTWAIT & NOBLOCK
for all versions.

src/pre_generated-zmq.nobj.c

@@ -243,6 +243,9 @@ typedef struct ffi_export_symbol {
 #if VERSION_2_0
 #  define ZMQ_POLL_MSEC    1000 // zmq_poll is usec
 #elif VERSION_3_0
+#ifndef ZMQ_NOBLOCK
+#  define ZMQ_NOBLOCK      ZMQ_DONTWAIT
+#endif
 #  define ZMQ_POLL_MSEC    1    // zmq_poll is msec
 #  ifndef ZMQ_HWM
 #    define ZMQ_HWM        1    // backwards compatibility
@@ -6473,6 +6476,9 @@ static const obj_const zmq_constants[] = {
 #ifdef ZMQ_MAX_VSM_SIZE
   {"MAX_VSM_SIZE", NULL, ZMQ_MAX_VSM_SIZE, CONST_NUMBER},
 #endif
+#ifdef ZMQ_RATE
+  {"RATE", NULL, ZMQ_RATE, CONST_NUMBER},
+#endif
 #ifdef ZMQ_DEALER
   {"DEALER", NULL, ZMQ_DEALER, CONST_NUMBER},
 #endif
@@ -6494,35 +6500,35 @@ static const obj_const zmq_constants[] = {
 #ifdef ZMQ_IDENTITY
   {"IDENTITY", NULL, ZMQ_IDENTITY, CONST_NUMBER},
 #endif
-#ifdef ZMQ_SWAP
-  {"SWAP", NULL, ZMQ_SWAP, CONST_NUMBER},
-#endif
-#ifdef ZMQ_RATE
-  {"RATE", NULL, ZMQ_RATE, CONST_NUMBER},
-#endif
 #ifdef ZMQ_STREAMER
   {"STREAMER", NULL, ZMQ_STREAMER, CONST_NUMBER},
 #endif
+#ifdef ZMQ_DEALER
+  {"XREQ", NULL, ZMQ_DEALER, CONST_NUMBER},
+#endif
 #ifdef ZMQ_MSG_MORE
   {"MSG_MORE", NULL, ZMQ_MSG_MORE, CONST_NUMBER},
 #endif
 #ifdef ZMQ_MAXMSGSIZE
   {"MAXMSGSIZE", NULL, ZMQ_MAXMSGSIZE, CONST_NUMBER},
 #endif
-#ifdef ZMQ_SUB
-  {"SUB", NULL, ZMQ_SUB, CONST_NUMBER},
-#endif
 #ifdef ZMQ_PULL
   {"PULL", NULL, ZMQ_PULL, CONST_NUMBER},
 #endif
+#ifdef ZMQ_SUB
+  {"SUB", NULL, ZMQ_SUB, CONST_NUMBER},
+#endif
 #ifdef ZMQ_PAIR
   {"PAIR", NULL, ZMQ_PAIR, CONST_NUMBER},
 #endif
-#ifdef ZMQ_DEALER
+#ifdef ZMQ_MULTICAST_HOPS
-  {"XREQ", NULL, ZMQ_DEALER, CONST_NUMBER},
+  {"MULTICAST_HOPS", NULL, ZMQ_MULTICAST_HOPS, CONST_NUMBER},
 #endif
-#ifdef ZMQ_VSM
+#ifdef ZMQ_FD
-  {"VSM", NULL, ZMQ_VSM, CONST_NUMBER},
+  {"FD", NULL, ZMQ_FD, CONST_NUMBER},
+#endif
+#ifdef ZMQ_SWAP
+  {"SWAP", NULL, ZMQ_SWAP, CONST_NUMBER},
 #endif
 #ifdef ZMQ_PUB
   {"PUB", NULL, ZMQ_PUB, CONST_NUMBER},
@@ -6536,21 +6542,21 @@ static const obj_const zmq_constants[] = {
 #ifdef ZMQ_SNDMORE
   {"SNDMORE", NULL, ZMQ_SNDMORE, CONST_NUMBER},
 #endif
-#ifdef ZMQ_FD
+#ifdef ZMQ_UNSUBSCRIBE
-  {"FD", NULL, ZMQ_FD, CONST_NUMBER},
+  {"UNSUBSCRIBE", NULL, ZMQ_UNSUBSCRIBE, CONST_NUMBER},
-#endif
-#ifdef ZMQ_MULTICAST_HOPS
-  {"MULTICAST_HOPS", NULL, ZMQ_MULTICAST_HOPS, CONST_NUMBER},
 #endif
 #ifdef ZMQ_PUSH
   {"PUSH", NULL, ZMQ_PUSH, CONST_NUMBER},
 #endif
-#ifdef ZMQ_UNSUBSCRIBE
-  {"UNSUBSCRIBE", NULL, ZMQ_UNSUBSCRIBE, CONST_NUMBER},
-#endif
 #ifdef ZMQ_RCVLABEL
   {"RCVLABEL", NULL, ZMQ_RCVLABEL, CONST_NUMBER},
 #endif
+#ifdef ZMQ_POLLIN
+  {"POLLIN", NULL, ZMQ_POLLIN, CONST_NUMBER},
+#endif
+#ifdef ZMQ_AFFINITY
+  {"AFFINITY", NULL, ZMQ_AFFINITY, CONST_NUMBER},
+#endif
 #ifdef ZMQ_POLLERR
   {"POLLERR", NULL, ZMQ_POLLERR, CONST_NUMBER},
 #endif
@@ -6563,29 +6569,29 @@ static const obj_const zmq_constants[] = {
 #ifdef ZMQ_HWM
   {"HWM", NULL, ZMQ_HWM, CONST_NUMBER},
 #endif
-#ifdef ZMQ_AFFINITY
+#ifdef ZMQ_RECONNECT_IVL_MSEC
-  {"AFFINITY", NULL, ZMQ_AFFINITY, CONST_NUMBER},
+  {"RECONNECT_IVL_MSEC", NULL, ZMQ_RECONNECT_IVL_MSEC, CONST_NUMBER},
 #endif
 #ifdef ZMQ_REQ
   {"REQ", NULL, ZMQ_REQ, CONST_NUMBER},
 #endif
-#ifdef ZMQ_RECONNECT_IVL_MSEC
-  {"RECONNECT_IVL_MSEC", NULL, ZMQ_RECONNECT_IVL_MSEC, CONST_NUMBER},
-#endif
 #ifdef ZMQ_BACKLOG
   {"BACKLOG", NULL, ZMQ_BACKLOG, CONST_NUMBER},
 #endif
+#ifdef ZMQ_RECONNECT_IVL_MAX
+  {"RECONNECT_IVL_MAX", NULL, ZMQ_RECONNECT_IVL_MAX, CONST_NUMBER},
+#endif
 #ifdef ZMQ_SNDLABEL
   {"SNDLABEL", NULL, ZMQ_SNDLABEL, CONST_NUMBER},
 #endif
 #ifdef ZMQ_QUEUE
   {"QUEUE", NULL, ZMQ_QUEUE, CONST_NUMBER},
 #endif
-#ifdef ZMQ_RECONNECT_IVL_MAX
+#ifdef ZMQ_RCVHWM
-  {"RECONNECT_IVL_MAX", NULL, ZMQ_RECONNECT_IVL_MAX, CONST_NUMBER},
+  {"RCVHWM", NULL, ZMQ_RCVHWM, CONST_NUMBER},
 #endif
-#ifdef ZMQ_POLLIN
+#ifdef ZMQ_VSM
-  {"POLLIN", NULL, ZMQ_POLLIN, CONST_NUMBER},
+  {"VSM", NULL, ZMQ_VSM, CONST_NUMBER},
 #endif
 #ifdef ZMQ_ROUTER
   {"XREP", NULL, ZMQ_ROUTER, CONST_NUMBER},
@@ -6596,8 +6602,8 @@ static const obj_const zmq_constants[] = {
 #ifdef ZMQ_MCAST_LOOP
   {"MCAST_LOOP", NULL, ZMQ_MCAST_LOOP, CONST_NUMBER},
 #endif
-#ifdef ZMQ_RCVHWM
+#ifdef ZMQ_DONTWAIT
-  {"RCVHWM", NULL, ZMQ_RCVHWM, CONST_NUMBER},
+  {"DONTWAIT", NULL, ZMQ_DONTWAIT, CONST_NUMBER},
 #endif
 #ifdef ZMQ_RECOVERY_IVL
   {"RECOVERY_IVL", NULL, ZMQ_RECOVERY_IVL, CONST_NUMBER},

zmq.nobj.lua

@@ -62,6 +62,9 @@ c_source "typedefs" [[
 #if VERSION_2_0
 #  define ZMQ_POLL_MSEC    1000 // zmq_poll is usec
 #elif VERSION_3_0
+#ifndef ZMQ_NOBLOCK
+#  define ZMQ_NOBLOCK      ZMQ_DONTWAIT
+#endif
 #  define ZMQ_POLL_MSEC    1    // zmq_poll is msec
 #  ifndef ZMQ_HWM
 #    define ZMQ_HWM        1    // backwards compatibility
@@ -135,6 +138,7 @@ RCVLABEL          = "ZMQ_RCVLABEL",
 
 -- send/recv flags
 NOBLOCK           = "ZMQ_NOBLOCK",
+DONTWAIT          = "ZMQ_DONTWAIT",
 SNDMORE           = "ZMQ_SNDMORE",
 SNDLABEL          = "ZMQ_SNDLABEL",