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

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

This commit is contained in:
Brenden Matthews 2018-12-22 16:05:36 -05:00
parent 94a854cfa2 ebfbb3f6df
commit 50a4aa25ab
No known key found for this signature in database
GPG Key ID: 60FBD122E62B0D30
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/toluapp/include/tolua++.h vendored
View File

@ -140,13 +140,13 @@ static inline const char* tolua_tocppstring (lua_State* L, int narg, const char*
const char* s = tolua_tostring(L, narg, def);
return s?s:"";
};
}
static inline const char* tolua_tofieldcppstring (lua_State* L, int lo, int index, const char* def) {
const char* s = tolua_tofieldstring(L, lo, index, def);
return s?s:"";
};
}
#else
#define tolua_tocppstring tolua_tostring