Llewellyn
/
conky
mirror of https://github.com/Llewellynvdm/conky.git
1
0
Fork 0
Code Issues Releases Activity

Merge commit 'f0eb4a34776fa30d0033a5f89aa7d7de5525ff7e' into fix-build-with-warnings-enabled

This commit is contained in:
Brenden Matthews 2018-12-22 15:27:08 -05:00
parent f18c43ccfb f0eb4a3477
commit e2b2e33f33
No known key found for this signature in database
GPG Key ID: 60FBD122E62B0D30
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/toluapp/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
build/

2
3rdparty/toluapp/src/bin/lua/package.lua vendored
View File

@ -189,7 +189,7 @@ function classPackage:register (pre)
output("#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 501\n");
output(pre.."TOLUA_API int luaopen_"..self.name.." (lua_State* tolua_S) {")
output(pre.." return tolua_"..self.name.."_open(tolua_S);")
output(pre.."};")
output(pre.."}")
output("#endif\n\n")
pop()

2
3rdparty/toluapp/src/lib/tolua_to.c vendored
View File

@ -127,8 +127,8 @@ TOLUA_API int tolua_tofieldvalue(lua_State *L, int lo, int index, int def)
TOLUA_API int tolua_getfieldboolean(lua_State *L, int lo, int index, int def)
{
(void)def;
int v;
(void)def;
lua_pushnumber(L, index);
lua_gettable(L, lo);
v = lua_isnil(L, -1) ? 0 : lua_toboolean(L, -1);