mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-06-10 11:12:21 +00:00
Merge commit 'ebfbb3f6dfb68e9c4701f1068f35f4c33ff47d07' into fix-build-with-warnings-enabled
This commit is contained in:
commit
50a4aa25ab
4
3rdparty/toluapp/include/tolua++.h
vendored
4
3rdparty/toluapp/include/tolua++.h
vendored
|
@ -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);
|
const char* s = tolua_tostring(L, narg, def);
|
||||||
return s?s:"";
|
return s?s:"";
|
||||||
};
|
}
|
||||||
|
|
||||||
static inline const char* tolua_tofieldcppstring (lua_State* L, int lo, int index, const char* def) {
|
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);
|
const char* s = tolua_tofieldstring(L, lo, index, def);
|
||||||
return s?s:"";
|
return s?s:"";
|
||||||
};
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
#define tolua_tocppstring tolua_tostring
|
#define tolua_tocppstring tolua_tostring
|
||||||
|
|
Loading…
Reference in New Issue
Block a user