Change where ZMQ_NOBLOCK is defined if missing.

pull/47/merge
Robert G. Jakabosky 14 years ago
parent 0aa2ed8e3f
commit 3058dce215

@ -237,15 +237,17 @@ typedef struct ffi_export_symbol {
# endif # endif
#endif #endif
/* make sure ZMQ_DONTWAIT & ZMQ_NOBLOCK are both defined. */
#ifndef ZMQ_DONTWAIT #ifndef ZMQ_DONTWAIT
# define ZMQ_DONTWAIT ZMQ_NOBLOCK # define ZMQ_DONTWAIT ZMQ_NOBLOCK
#endif #endif
#if VERSION_2_0
# define ZMQ_POLL_MSEC 1000 // zmq_poll is usec
#elif VERSION_3_0
#ifndef ZMQ_NOBLOCK #ifndef ZMQ_NOBLOCK
# define ZMQ_NOBLOCK ZMQ_DONTWAIT # define ZMQ_NOBLOCK ZMQ_DONTWAIT
#endif #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 # define ZMQ_POLL_MSEC 1 // zmq_poll is msec
# ifndef ZMQ_HWM # ifndef ZMQ_HWM
# define ZMQ_HWM 1 // backwards compatibility # define ZMQ_HWM 1 // backwards compatibility

@ -56,15 +56,17 @@ c_source "typedefs" [[
# endif # endif
#endif #endif
/* make sure ZMQ_DONTWAIT & ZMQ_NOBLOCK are both defined. */
#ifndef ZMQ_DONTWAIT #ifndef ZMQ_DONTWAIT
# define ZMQ_DONTWAIT ZMQ_NOBLOCK # define ZMQ_DONTWAIT ZMQ_NOBLOCK
#endif #endif
#if VERSION_2_0
# define ZMQ_POLL_MSEC 1000 // zmq_poll is usec
#elif VERSION_3_0
#ifndef ZMQ_NOBLOCK #ifndef ZMQ_NOBLOCK
# define ZMQ_NOBLOCK ZMQ_DONTWAIT # define ZMQ_NOBLOCK ZMQ_DONTWAIT
#endif #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 # define ZMQ_POLL_MSEC 1 // zmq_poll is msec
# ifndef ZMQ_HWM # ifndef ZMQ_HWM
# define ZMQ_HWM 1 // backwards compatibility # define ZMQ_HWM 1 // backwards compatibility

Loading…
Cancel
Save