From 901355e5b714b4e41c1f0d87516c4b9924d8357e Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 13 Dec 2015 18:45:02 +0100 Subject: [PATCH] luainstance: fix types to allow compilation with newer gcc Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/b62da2624eebd5e14cd5f160536b029c56256755 Author: Stefan Seyfried Date: 2015-12-13 (Sun, 13 Dec 2015) --- src/gui/lua/luainstance.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp index 4e53e40a7..1271db909 100644 --- a/src/gui/lua/luainstance.cpp +++ b/src/gui/lua/luainstance.cpp @@ -740,7 +740,7 @@ int CLuaInstance::PaintBox(lua_State *L) int count = lua_gettop(L); LUA_DEBUG("CLuaInstance::%s %d\n", __func__, count); int x, y, w, h, radius = 0, corner = CORNER_ALL; - unsigned int c; + lua_Unsigned c; CLuaData *W = CheckData(L, 1); if (!W || !W->fbwin) return 0; @@ -777,7 +777,7 @@ int CLuaInstance::PaintBox(lua_State *L) int CLuaInstance::paintHLineRel(lua_State *L) { int x, y, dx; - unsigned int c; + lua_Unsigned c; CLuaData *W = CheckData(L, 1); if (!W || !W->fbwin) return 0; @@ -805,7 +805,7 @@ int CLuaInstance::paintHLineRel(lua_State *L) int CLuaInstance::paintVLineRel(lua_State *L) { int x, y, dy; - unsigned int c; + lua_Unsigned c; CLuaData *W = CheckData(L, 1); if (!W || !W->fbwin) return 0; @@ -836,7 +836,7 @@ int CLuaInstance::RenderString(lua_State *L) { int x, y, w, boxh, center; Font* font = NULL; - unsigned int c; + lua_Unsigned c; const char *text; int numargs = lua_gettop(L); LUA_DEBUG("CLuaInstance::%s %d\n", __func__, numargs); @@ -1010,7 +1010,8 @@ int CLuaInstance::getDynFont(lua_State *L) 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=""; dx = luaL_checkint(L, 2);