diff --git a/src/pre_generated-zmq.nobj.c b/src/pre_generated-zmq.nobj.c
index 9d1bf74..9a75d74 100644
--- a/src/pre_generated-zmq.nobj.c
+++ b/src/pre_generated-zmq.nobj.c
@@ -237,15 +237,17 @@ typedef struct ffi_export_symbol {
 #  endif
 #endif
 
+/* make sure ZMQ_DONTWAIT & ZMQ_NOBLOCK are both defined. */
 #ifndef ZMQ_DONTWAIT
 #  define ZMQ_DONTWAIT     ZMQ_NOBLOCK
 #endif
-#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
+
+#if VERSION_2_0
+#  define ZMQ_POLL_MSEC    1000 // zmq_poll is usec
+#elif VERSION_3_0
 #  define ZMQ_POLL_MSEC    1    // zmq_poll is msec
 #  ifndef ZMQ_HWM
 #    define ZMQ_HWM        1    // backwards compatibility
diff --git a/zmq.nobj.lua b/zmq.nobj.lua
index 98bd03c..bc6fa72 100644
--- a/zmq.nobj.lua
+++ b/zmq.nobj.lua
@@ -56,15 +56,17 @@ c_source "typedefs" [[
 #  endif
 #endif
 
+/* make sure ZMQ_DONTWAIT & ZMQ_NOBLOCK are both defined. */
 #ifndef ZMQ_DONTWAIT
 #  define ZMQ_DONTWAIT     ZMQ_NOBLOCK
 #endif
-#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
+
+#if VERSION_2_0
+#  define ZMQ_POLL_MSEC    1000 // zmq_poll is usec
+#elif VERSION_3_0
 #  define ZMQ_POLL_MSEC    1    // zmq_poll is msec
 #  ifndef ZMQ_HWM
 #    define ZMQ_HWM        1    // backwards compatibility