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

Tekenlight · Jan 5, 2015 · 3c55790 · 3c55790
1 parent 0adfa77
commit 3c55790
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lobject.h b/lobject.h
@@ -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
 ** See Copyright Notice in lua.h
 */
@@ -473,7 +473,7 @@ typedef union TKey {
 
 
 /* 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); \
 	  k_->nk.value_ = io_->value_; k_->nk.tt_ = io_->tt_; \
 	  (void)L; checkliveness(G(L),io_); }

diff --git a/ltable.c b/ltable.c
@@ -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)
 ** See Copyright Notice in lua.h
 */
@@ -484,7 +484,7 @@ TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key) {
       mp = f;
     }
   }
-  setkey(L, &mp->i_key, key);
+  setnodekey(L, &mp->i_key, key);
   luaC_barrierback(L, t, key);
   lua_assert(ttisnil(gval(mp)));
   return gval(mp);