Lua_cmsgpack added to Redis scripting.

diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile
index 6caed7419bc3b3c38cdcc4c80aaca0cc9c88f409..77d6a48b4b1362e24cac5427145f033cec177a8f 100644 (file)
--- a/deps/lua/src/Makefile
+++ b/deps/lua/src/Makefile
@@ -27,7 +27,7 @@ CORE_O=       lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
        lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
        lundump.o lvm.o lzio.o strbuf.o
 LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
        lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
        lundump.o lvm.o lzio.o strbuf.o
 LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \

-       lstrlib.o loadlib.o linit.o lua_cjson.o lua_struct.o
+       lstrlib.o loadlib.o linit.o lua_cjson.o lua_struct.o lua_cmsgpack.o

 
 LUA_T= lua
 LUA_O= lua.o
 
 LUA_T= lua
 LUA_O= lua.o

diff --git a/src/scripting.c b/src/scripting.c
index 9d41a45f22dc83d19cb967082f97005c8e19e227..ce1f0877bf47a3b2c002786b348f567d0db98349 100644 (file)
--- a/src/scripting.c
+++ b/src/scripting.c
@@ -344,6 +344,7 @@ void luaLoadLib(lua_State *lua, const char *libname, lua_CFunction luafunc) {
 
 LUALIB_API int (luaopen_cjson) (lua_State *L);
 LUALIB_API int (luaopen_struct) (lua_State *L);
 
 LUALIB_API int (luaopen_cjson) (lua_State *L);
 LUALIB_API int (luaopen_struct) (lua_State *L);

+LUALIB_API int (luaopen_cmsgpack) (lua_State *L);

 
 void luaLoadLibraries(lua_State *lua) {
     luaLoadLib(lua, "", luaopen_base);
 
 void luaLoadLibraries(lua_State *lua) {
     luaLoadLib(lua, "", luaopen_base);


@@ -353,6 +354,7 @@ void luaLoadLibraries(lua_State *lua) {
     luaLoadLib(lua, LUA_DBLIBNAME, luaopen_debug); 
     luaLoadLib(lua, "cjson", luaopen_cjson);
     luaLoadLib(lua, "struct", luaopen_struct);
     luaLoadLib(lua, LUA_DBLIBNAME, luaopen_debug); 
     luaLoadLib(lua, "cjson", luaopen_cjson);
     luaLoadLib(lua, "struct", luaopen_struct);

+    luaLoadLib(lua, "cmsgpack", luaopen_cmsgpack);

 
 #if 0 /* Stuff that we don't load currently, for sandboxing concerns. */
     luaLoadLib(lua, LUA_LOADLIBNAME, luaopen_package);
 
 #if 0 /* Stuff that we don't load currently, for sandboxing concerns. */
     luaLoadLib(lua, LUA_LOADLIBNAME, luaopen_package);