Change where ZMQ_NOBLOCK is defined if missing.

14 years ago · 3058dce215
parent 0aa2ed8e3f
commit 3058dce215
2 changed files with 10 additions and 6 deletions
--- 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
--- 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