diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2004-05-11 13:52:08 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2004-05-11 13:52:08 -0300 |
commit | 7966a4acaea50230e30acc8fd6997bce22307f24 (patch) | |
tree | 76469b06d5067cbf3958a425927b5cebfe198ef6 /lapi.c | |
parent | 37cd986532e2be00fe2504a1ebe0f1120ccc3979 (diff) | |
download | lua-7966a4acaea50230e30acc8fd6997bce22307f24.tar.gz lua-7966a4acaea50230e30acc8fd6997bce22307f24.tar.bz2 lua-7966a4acaea50230e30acc8fd6997bce22307f24.zip |
avoid name clashes among different files
Diffstat (limited to 'lapi.c')
-rw-r--r-- | lapi.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lapi.c,v 2.6 2004/04/05 14:43:17 roberto Exp roberto $ | 2 | ** $Id: lapi.c,v 2.7 2004/04/30 20:13:38 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 | */ |
@@ -691,7 +691,7 @@ LUA_API int lua_setfenv (lua_State *L, int idx) { | |||
691 | */ | 691 | */ |
692 | 692 | ||
693 | 693 | ||
694 | #define adjuststack(L,nres) \ | 694 | #define adjustresults(L,nres) \ |
695 | { if (nres == LUA_MULTRET && L->top >= L->ci->top) L->ci->top = L->top; } | 695 | { if (nres == LUA_MULTRET && L->top >= L->ci->top) L->ci->top = L->top; } |
696 | 696 | ||
697 | 697 | ||
@@ -701,7 +701,7 @@ LUA_API void lua_call (lua_State *L, int nargs, int nresults) { | |||
701 | api_checknelems(L, nargs+1); | 701 | api_checknelems(L, nargs+1); |
702 | func = L->top - (nargs+1); | 702 | func = L->top - (nargs+1); |
703 | luaD_call(L, func, nresults); | 703 | luaD_call(L, func, nresults); |
704 | adjuststack(L, nresults); | 704 | adjustresults(L, nresults); |
705 | lua_unlock(L); | 705 | lua_unlock(L); |
706 | } | 706 | } |
707 | 707 | ||
@@ -738,7 +738,7 @@ LUA_API int lua_pcall (lua_State *L, int nargs, int nresults, int errfunc) { | |||
738 | c.func = L->top - (nargs+1); /* function to be called */ | 738 | c.func = L->top - (nargs+1); /* function to be called */ |
739 | c.nresults = nresults; | 739 | c.nresults = nresults; |
740 | status = luaD_pcall(L, f_call, &c, savestack(L, c.func), func); | 740 | status = luaD_pcall(L, f_call, &c, savestack(L, c.func), func); |
741 | adjuststack(L, nresults); | 741 | adjustresults(L, nresults); |
742 | lua_unlock(L); | 742 | lua_unlock(L); |
743 | return status; | 743 | return status; |
744 | } | 744 | } |