aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2015-06-18 11:19:52 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2015-06-18 11:19:52 -0300
commitdcad08b76d3d251c0beff4e7c692035c11641509 (patch)
tree86f74a2de93edc99d200846d8ace9366c8013814
parentafbf5c5dab0b761f8f7344882dd7affd60dc7035 (diff)
downloadlua-dcad08b76d3d251c0beff4e7c692035c11641509.tar.gz
lua-dcad08b76d3d251c0beff4e7c692035c11641509.tar.bz2
lua-dcad08b76d3d251c0beff4e7c692035c11641509.zip
details (use original type when saving variable's value)
-rw-r--r--lapi.c4
-rw-r--r--ldo.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/lapi.c b/lapi.c
index 608d48c2..2b045bb5 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lapi.c,v 2.248 2015/03/28 19:14:47 roberto Exp roberto $ 2** $Id: lapi.c,v 2.249 2015/04/06 12:23:48 roberto Exp roberto $
3** Lua API 3** Lua API
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -1043,7 +1043,7 @@ LUA_API int lua_gc (lua_State *L, int what, int data) {
1043 } 1043 }
1044 case LUA_GCSTEP: { 1044 case LUA_GCSTEP: {
1045 l_mem debt = 1; /* =1 to signal that it did an actual step */ 1045 l_mem debt = 1; /* =1 to signal that it did an actual step */
1046 int oldrunning = g->gcrunning; 1046 lu_byte oldrunning = g->gcrunning;
1047 g->gcrunning = 1; /* allow GC to run */ 1047 g->gcrunning = 1; /* allow GC to run */
1048 if (data == 0) { 1048 if (data == 0) {
1049 luaE_setdebt(g, -GCSTEPSIZE); /* to do a "small" step */ 1049 luaE_setdebt(g, -GCSTEPSIZE); /* to do a "small" step */
diff --git a/ldo.c b/ldo.c
index 2d0ad25a..155ecf76 100644
--- a/ldo.c
+++ b/ldo.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: ldo.c,v 2.137 2015/03/30 16:05:23 roberto Exp roberto $ 2** $Id: ldo.c,v 2.138 2015/05/22 17:48:19 roberto Exp roberto $
3** Stack and Call structure of Lua 3** Stack and Call structure of Lua
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -570,7 +570,7 @@ static void resume (lua_State *L, void *ud) {
570 570
571LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs) { 571LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs) {
572 int status; 572 int status;
573 int oldnny = L->nny; /* save "number of non-yieldable" calls */ 573 unsigned short oldnny = L->nny; /* save "number of non-yieldable" calls */
574 lua_lock(L); 574 lua_lock(L);
575 luai_userstateresume(L, nargs); 575 luai_userstateresume(L, nargs);
576 L->nCcalls = (from) ? from->nCcalls + 1 : 1; 576 L->nCcalls = (from) ? from->nCcalls + 1 : 1;