Merge branch 'master' into v2.1

2013-10-14 19:34:06 +02:00
parent 4ccb2dd3bb 5d25645a21
commit d0b48ec996
4 changed files with 18 additions and 1 deletions
--- a/src/lj_tab.h
+++ b/src/lj_tab.h
@@ -40,6 +40,9 @@ LJ_FUNC GCtab * LJ_FASTCALL lj_tab_new1(lua_State *L, uint32_t ahsize);
 #endif
 LJ_FUNCA GCtab * LJ_FASTCALL lj_tab_dup(lua_State *L, const GCtab *kt);
 LJ_FUNC void LJ_FASTCALL lj_tab_free(global_State *g, GCtab *t);
+#if LJ_HASFFI
+LJ_FUNC void lj_tab_rehash(lua_State *L, GCtab *t);
+#endif
 LJ_FUNCA void lj_tab_reasize(lua_State *L, GCtab *t, uint32_t nasize);

 /* Caveat: all getters except lj_tab_get() can return NULL! */