From 67993e7953dd97046656818e2a0dc0dd3f9271ef Mon Sep 17 00:00:00 2001
From: "Robert G. Jakabosky" <bobby@sharedrealm.com>
Date: Sun, 4 Dec 2011 01:15:56 -0800
Subject: [PATCH] Remove loading of libzmq.so/libzmq.dll for FFI bindings,
 since the symbols are accessible from zmq.so which we where loading.

---
 src/pre_generated-zmq.nobj.c | 13 ++++---------
 zmq.nobj.lua                 |  7 +------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/pre_generated-zmq.nobj.c b/src/pre_generated-zmq.nobj.c
index 6cf499b..eaf0395 100644
--- a/src/pre_generated-zmq.nobj.c
+++ b/src/pre_generated-zmq.nobj.c
@@ -1033,7 +1033,7 @@ static const char zmq_ffi_lua_code[] = "local ffi=require\"ffi\"\n"
 "		_pub[obj_name] = constructor\n"
 "	end\n"
 "end\n"
-"local C = ffi_load_cmodule(\"zmq\", true)\n"
+"local C = ffi_load_cmodule(\"zmq\", false)\n"
 "\n"
 "ffi.cdef[[\n"
 "typedef int ZMQ_Error;\n"
@@ -1376,11 +1376,6 @@ static const char zmq_ffi_lua_code[] = "local ffi=require\"ffi\"\n"
 "end\n"
 "\n"
 "\n"
-"local os_lib_table = {\n"
-"	[\"Windows\"] = \"libzmq\",\n"
-"}\n"
-"local C = ffi_load(os_lib_table[ffi.os] or \"zmq\", true)\n"
-"\n"
 "\n"
 "-- Start \"ZErrors\" FFI interface\n"
 "-- End \"ZErrors\" FFI interface\n"
@@ -1561,7 +1556,7 @@ static const char zmq_ffi_lua_code[] = "local ffi=require\"ffi\"\n"
 "-- Start \"ZMQ_Socket\" FFI interface\n"
 "-- method: close\n"
 "function _meth.ZMQ_Socket.close(self)\n"
-"  local self, free,this_flags1=obj_type_ZMQ_Socket_delete(self)\n"
+"  local self,this_flags1 = obj_type_ZMQ_Socket_delete(self)\n"
 "  if not self then return end\n"
 "  local rc_zmq_close1\n"
 "  rc_zmq_close1 = C.zmq_close(self)\n"
@@ -1978,7 +1973,7 @@ static const char zmq_ffi_lua_code[] = "local ffi=require\"ffi\"\n"
 "-- Start \"ZMQ_Ctx\" FFI interface\n"
 "-- method: term\n"
 "function _meth.ZMQ_Ctx.term(self)\n"
-"  local self, free,this_flags1=obj_type_ZMQ_Ctx_delete(self)\n"
+"  local self,this_flags1 = obj_type_ZMQ_Ctx_delete(self)\n"
 "  if not self then return end\n"
 "  local rc_zmq_term1\n"
 "  rc_zmq_term1 = C.zmq_term(self)\n"
@@ -2027,7 +2022,7 @@ static const char zmq_ffi_lua_code[] = "local ffi=require\"ffi\"\n"
 "register_default_constructor(_pub,\"ZMQ_StopWatch\",_pub.ZMQ_StopWatch.start)\n"
 "-- method: stop\n"
 "function _meth.ZMQ_StopWatch.stop(self)\n"
-"  local self, free,this_flags1=obj_type_ZMQ_StopWatch_delete(self)\n"
+"  local self,this_flags1 = obj_type_ZMQ_StopWatch_delete(self)\n"
 "  if not self then return end\n"
 "  local usecs1\n"
 "  usecs1 = C.zmq_stopwatch_stop(self)\n"
diff --git a/zmq.nobj.lua b/zmq.nobj.lua
index 6a2c00f..fc1f254 100644
--- a/zmq.nobj.lua
+++ b/zmq.nobj.lua
@@ -26,16 +26,11 @@ c_module "zmq" {
 use_globals = false,
 hide_meta_info = true,
 luajit_ffi = true,
-luajit_ffi_load_cmodule = "global",
+luajit_ffi_load_cmodule = true,
 
 sys_include "string.h",
 include "zmq.h",
 
-ffi_load { global = true,
-"zmq", -- default lib name.
-Windows = "libzmq", -- lib name for on windows.
-},
-
 --
 -- Module constants
 --