From 8439751b910bb67e05c456227b439e81aaf8d8a8 Mon Sep 17 00:00:00 2001 From: "Robert G. Jakabosky" Date: Thu, 21 Apr 2011 16:08:41 -0700 Subject: [PATCH] Add detection code for really old ZeroMQ 2.0.x series. --- src/pre_generated-zmq.nobj.c | 7 +++++++ src/socket.nobj.lua | 5 +++++ zmq.nobj.lua | 2 ++ 3 files changed, 14 insertions(+) diff --git a/src/pre_generated-zmq.nobj.c b/src/pre_generated-zmq.nobj.c index 2c30661..b42e10e 100644 --- a/src/pre_generated-zmq.nobj.c +++ b/src/pre_generated-zmq.nobj.c @@ -1740,6 +1740,11 @@ static const char zmq_ffi_lua_code[] = "-- try loading luajit's ffi\n" #endif #endif +/* detect really old ZeroMQ 2.0.x series. */ +#if !defined(ZMQ_RCVMORE) +#error "Your version of ZeroMQ is too, old." +#endif + typedef void * ZMQ_Socket; #ifdef _WIN32 @@ -1990,9 +1995,11 @@ static const char *get_zmq_strerror() { case EAGAIN: return "timeout"; break; +#if defined(ETERM) case ETERM: return "closed"; break; +#endif default: break; } diff --git a/src/socket.nobj.lua b/src/socket.nobj.lua index ea862f8..76c9a21 100644 --- a/src/socket.nobj.lua +++ b/src/socket.nobj.lua @@ -33,6 +33,11 @@ typedef void * ZMQ_Socket; #endif #endif +/* detect really old ZeroMQ 2.0.x series. */ +#if !defined(ZMQ_RCVMORE) +#error "Your version of ZeroMQ is too, old." +#endif + typedef void * ZMQ_Socket; #ifdef _WIN32 diff --git a/zmq.nobj.lua b/zmq.nobj.lua index 09485d1..565a07e 100644 --- a/zmq.nobj.lua +++ b/zmq.nobj.lua @@ -46,9 +46,11 @@ static const char *get_zmq_strerror() { case EAGAIN: return "timeout"; break; +#if defined(ETERM) case ETERM: return "closed"; break; +#endif default: break; }