rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

'setkey' -> 'setnodekey' (to avoid conflicts with POSIX)

This commit is contained in:
Roberto Ierusalimschy 2015-01-05 11:52:37 -02:00
parent 0adfa773b9
commit 3c55790ebe
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lobject.h
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lobject.h,v 2.104 2014/10/25 11:50:46 roberto Exp roberto $ ** $Id: lobject.h,v 2.105 2014/12/19 13:36:32 roberto Exp roberto $
** Type definitions for Lua objects ** Type definitions for Lua objects
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -473,7 +473,7 @@ typedef union TKey {
/* copy a value into a key without messing up field 'next' */ /* copy a value into a key without messing up field 'next' */
#define setkey(L,key,obj) \ #define setnodekey(L,key,obj) \
{ TKey *k_=(key); const TValue *io_=(obj); \ { TKey *k_=(key); const TValue *io_=(obj); \
k_->nk.value_ = io_->value_; k_->nk.tt_ = io_->tt_; \ k_->nk.value_ = io_->value_; k_->nk.tt_ = io_->tt_; \
(void)L; checkliveness(G(L),io_); } (void)L; checkliveness(G(L),io_); }

4
ltable.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: ltable.c,v 2.98 2014/10/25 11:50:46 roberto Exp roberto $ ** $Id: ltable.c,v 2.99 2014/11/02 19:19:04 roberto Exp roberto $
** Lua tables (hash) ** Lua tables (hash)
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -484,7 +484,7 @@ TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key) {
mp = f; mp = f;
} }
} }
setkey(L, &mp->i_key, key); setnodekey(L, &mp->i_key, key);
luaC_barrierback(L, t, key); luaC_barrierback(L, t, key);
lua_assert(ttisnil(gval(mp))); lua_assert(ttisnil(gval(mp)));
return gval(mp); return gval(mp);