mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-12-24 11:55:43 +00:00
Merge commit 'f0eb4a34776fa30d0033a5f89aa7d7de5525ff7e' into fix-build-with-warnings-enabled
This commit is contained in:
commit
e2b2e33f33
1
3rdparty/toluapp/.gitignore
vendored
Normal file
1
3rdparty/toluapp/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
build/
|
2
3rdparty/toluapp/src/bin/lua/package.lua
vendored
2
3rdparty/toluapp/src/bin/lua/package.lua
vendored
@ -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
2
3rdparty/toluapp/src/lib/tolua_to.c
vendored
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user