luainstance: fix types to allow compilation with newer gcc

This commit is contained in:
Stefan Seyfried
2015-12-13 18:45:02 +01:00
parent fa2acb0e44
commit 8a66f79239

View File

@@ -687,7 +687,7 @@ int CLuaInstance::PaintBox(lua_State *L)
int count = lua_gettop(L); int count = lua_gettop(L);
LUA_DEBUG("CLuaInstance::%s %d\n", __func__, count); LUA_DEBUG("CLuaInstance::%s %d\n", __func__, count);
int x, y, w, h, radius = 0, corner = CORNER_ALL; int x, y, w, h, radius = 0, corner = CORNER_ALL;
unsigned int c; lua_Unsigned c;
CLuaData *W = CheckData(L, 1); CLuaData *W = CheckData(L, 1);
if (!W || !W->fbwin) if (!W || !W->fbwin)
@@ -725,7 +725,7 @@ int CLuaInstance::PaintBox(lua_State *L)
int CLuaInstance::paintHLineRel(lua_State *L) int CLuaInstance::paintHLineRel(lua_State *L)
{ {
int x, y, dx; int x, y, dx;
unsigned int c; lua_Unsigned c;
CLuaData *W = CheckData(L, 1); CLuaData *W = CheckData(L, 1);
if (!W || !W->fbwin) if (!W || !W->fbwin)
@@ -754,7 +754,7 @@ int CLuaInstance::paintHLineRel(lua_State *L)
int CLuaInstance::paintVLineRel(lua_State *L) int CLuaInstance::paintVLineRel(lua_State *L)
{ {
int x, y, dy; int x, y, dy;
unsigned int c; lua_Unsigned c;
CLuaData *W = CheckData(L, 1); CLuaData *W = CheckData(L, 1);
if (!W || !W->fbwin) if (!W || !W->fbwin)
@@ -786,7 +786,7 @@ int CLuaInstance::RenderString(lua_State *L)
{ {
int x, y, w, boxh, center; int x, y, w, boxh, center;
Font* font = NULL; Font* font = NULL;
unsigned int c; lua_Unsigned c;
const char *text; const char *text;
int numargs = lua_gettop(L); int numargs = lua_gettop(L);
LUA_DEBUG("CLuaInstance::%s %d\n", __func__, numargs); LUA_DEBUG("CLuaInstance::%s %d\n", __func__, numargs);
@@ -964,7 +964,8 @@ int CLuaInstance::getDynFont(lua_State *L)
return 2; return 2;
} }
lua_Integer dx = 0, dy = 0, style = CNeutrinoFonts::FONT_STYLE_REGULAR; int dx = 0, dy = 0;
lua_Integer style = CNeutrinoFonts::FONT_STYLE_REGULAR;
std::string text=""; std::string text="";
dx = luaL_checkint(L, 2); dx = luaL_checkint(L, 2);