diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2023-11-03 15:39:14 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2023-11-03 15:39:14 -0300 |
commit | fa075b79530af1cbc977349f2e467d69ce01202c (patch) | |
tree | 300e10cd086a9812331b954d46552dbf420b0a8a /lstate.h | |
parent | 08a077d673b25cf1fbfe21794f240f4ff4999667 (diff) | |
parent | 7923dbbf72da303ca1cca17efd24725668992f15 (diff) | |
download | lua-fa075b79530af1cbc977349f2e467d69ce01202c.tar.gz lua-fa075b79530af1cbc977349f2e467d69ce01202c.tar.bz2 lua-fa075b79530af1cbc977349f2e467d69ce01202c.zip |
Merge branch 'master' into newarray
Diffstat (limited to 'lstate.h')
-rw-r--r-- | lstate.h | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -181,7 +181,7 @@ struct CallInfo { | |||
181 | union { | 181 | union { |
182 | struct { /* only for Lua functions */ | 182 | struct { /* only for Lua functions */ |
183 | const Instruction *savedpc; | 183 | const Instruction *savedpc; |
184 | volatile l_signalT trap; | 184 | volatile l_signalT trap; /* function is tracing lines/counts */ |
185 | int nextraargs; /* # of extra arguments in vararg functions */ | 185 | int nextraargs; /* # of extra arguments in vararg functions */ |
186 | } l; | 186 | } l; |
187 | struct { /* only for C functions */ | 187 | struct { /* only for C functions */ |
@@ -396,7 +396,6 @@ union GCUnion { | |||
396 | LUAI_FUNC void luaE_setdebt (global_State *g, l_mem debt); | 396 | LUAI_FUNC void luaE_setdebt (global_State *g, l_mem debt); |
397 | LUAI_FUNC void luaE_freethread (lua_State *L, lua_State *L1); | 397 | LUAI_FUNC void luaE_freethread (lua_State *L, lua_State *L1); |
398 | LUAI_FUNC CallInfo *luaE_extendCI (lua_State *L); | 398 | LUAI_FUNC CallInfo *luaE_extendCI (lua_State *L); |
399 | LUAI_FUNC void luaE_freeCI (lua_State *L); | ||
400 | LUAI_FUNC void luaE_shrinkCI (lua_State *L); | 399 | LUAI_FUNC void luaE_shrinkCI (lua_State *L); |
401 | LUAI_FUNC void luaE_checkcstack (lua_State *L); | 400 | LUAI_FUNC void luaE_checkcstack (lua_State *L); |
402 | LUAI_FUNC void luaE_incCstack (lua_State *L); | 401 | LUAI_FUNC void luaE_incCstack (lua_State *L); |