diff options
| author | mbalmer <mbalmer@NetBSD.org> | 2015-10-08 13:21:00 +0000 |
|---|---|---|
| committer | mbalmer <mbalmer@NetBSD.org> | 2015-10-08 13:21:00 +0000 |
| commit | 649cf8e53381cbc6057d92bbf44588bb7024bdd2 (patch) | |
| tree | 37d60c2028507b3425901810054e008ce1f65440 /external/mit/lua/dist/src/lua.h | |
| parent | 14a62719979f511f0c63a80b66d3ca7202ffc862 (diff) | |
update after conflict resolution
Diffstat (limited to 'external/mit/lua/dist/src/lua.h')
| -rw-r--r-- | external/mit/lua/dist/src/lua.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/external/mit/lua/dist/src/lua.h b/external/mit/lua/dist/src/lua.h index 66638f19eb1..b80435cebb5 100644 --- a/external/mit/lua/dist/src/lua.h +++ b/external/mit/lua/dist/src/lua.h @@ -1,7 +1,7 @@ -/* $NetBSD: lua.h,v 1.4 2015/02/19 04:46:22 lneto Exp $ */ +/* $NetBSD: lua.h,v 1.5 2015/10/08 13:21:00 mbalmer Exp $ */ /* -** Id: lua.h,v 1.325 2014/12/26 17:24:27 roberto Exp +** Id: lua.h,v 1.328 2015/06/03 13:03:38 roberto Exp ** Lua - A Scripting Language ** Lua.org, PUC-Rio, Brazil (http://www.lua.org) ** See Copyright Notice at the end of this file @@ -24,9 +24,9 @@ #define LUA_VERSION_MINOR "3" #define LUA_VERSION_NUM 503 #ifndef _KERNEL -#define LUA_VERSION_RELEASE "0" +#define LUA_VERSION_RELEASE "1" #else /* _KERNEL */ -#define LUA_VERSION_RELEASE "0 (kernel)" +#define LUA_VERSION_RELEASE "1 (kernel)" #endif #define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR @@ -49,9 +49,11 @@ /* -** pseudo-indices +** Pseudo-indices +** (-LUAI_MAXSTACK is the minimum valid index; we keep some free empty +** space after that to help overflow detection) */ -#define LUA_REGISTRYINDEX LUAI_FIRSTPSEUDOIDX +#define LUA_REGISTRYINDEX (-LUAI_MAXSTACK - 1000) #define lua_upvalueindex(i) (LUA_REGISTRYINDEX - (i)) @@ -389,8 +391,7 @@ LUA_API void (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud); #define lua_isnone(L,n) (lua_type(L, (n)) == LUA_TNONE) #define lua_isnoneornil(L, n) (lua_type(L, (n)) <= 0) -#define lua_pushliteral(L, s) \ - lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1) +#define lua_pushliteral(L, s) lua_pushstring(L, "" s) #define lua_pushglobaltable(L) \ lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS) |
