From 4642135e1239ccaa58485854d9eaf69d85bf0ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
Date: Mon, 13 Aug 2012 19:02:14 +0200
Subject: [PATCH] Fix crash in {set,get}sockoption with zmq 3.2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	$ lua examples/server_poll.lua
	Invalid socket option type, this shouldn't happen.
	Aborted (core dumped)

Signed-off-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Robert G. Jakabosky <bobby@sharedrealm.com>
---
 src/socket.nobj.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/socket.nobj.lua b/src/socket.nobj.lua
index 7c3d4a6..ef7a0db 100644
--- a/src/socket.nobj.lua
+++ b/src/socket.nobj.lua
@@ -504,7 +504,7 @@ end
 	size_t val_len;
 	const void *val;
 
-#if VERSION_2_1
+#if defined(VERSION_2_1) || defined(VERSION_3_0)
 	socket_t fd_val;
 #endif
 	int int_val;
@@ -531,7 +531,7 @@ end
 	}
 
 	switch(opt_types[${opt}]) {
-#if VERSION_2_1
+#if defined(VERSION_2_1) || defined(VERSION_3_0)
 	case OPT_TYPE_FD:
 		fd_val = luaL_checklong(L, ${val::idx});
 		val = &fd_val;
@@ -588,7 +588,7 @@ local tmp_val_len = ffi.new('size_t[1]', 4)
 		c_source[[
 	size_t val_len;
 
-#if VERSION_2_1
+#if defined(VERSION_2_1) || defined(VERSION_3_0)
 	socket_t fd_val;
 #endif
 	int int_val;
@@ -605,7 +605,7 @@ local tmp_val_len = ffi.new('size_t[1]', 4)
 	}
 
 	switch(opt_types[${opt}]) {
-#if VERSION_2_1
+#if defined(VERSION_2_1) || defined(VERSION_3_0)
 	case OPT_TYPE_FD:
 		val_len = sizeof(fd_val);
 		${err} = zmq_getsockopt(${this}, ${opt}, &fd_val, &val_len);