From f0fd8edddc8aea1c619193df35a251ee66fdba54 Mon Sep 17 00:00:00 2001
From: "Robert G. Jakabosky" <bobby@sharedrealm.com>
Date: Wed, 28 Dec 2011 16:10:12 -0800
Subject: [PATCH] Fix some Luvit issues.

---
 src/pre_generated-zmq.nobj.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pre_generated-zmq.nobj.c b/src/pre_generated-zmq.nobj.c
index b762661..8a3fbf0 100644
--- a/src/pre_generated-zmq.nobj.c
+++ b/src/pre_generated-zmq.nobj.c
@@ -364,7 +364,6 @@ static int nobj_try_loading_ffi(lua_State *L, const char *ffi_mod_name,
 			msg = lua_tostring(L, -1);
 		}
 		printf("Failed to install FFI-based bindings: %s\n", msg);
-lua_error(L);
 		lua_pop(L, 1); /* pop error message. */
 	}
 	return err;
@@ -1041,12 +1040,14 @@ static const char zmq_ffi_lua_code[] = "local ffi=require\"ffi\"\n"
 "local type = type\n"
 "local tonumber = tonumber\n"
 "local tostring = tostring\n"
-"local sformat = string.format\n"
+"local sformat = require\"string\".format\n"
 "local rawset = rawset\n"
 "local setmetatable = setmetatable\n"
+"local package = (require\"package\") or {}\n"
 "local p_config = package.config\n"
 "local p_cpath = package.cpath\n"
 "\n"
+"\n"
 "local ffi_load_cmodule\n"
 "\n"
 "-- try to detect luvit.\n"