diff options
author | Mike Pall <mike> | 2013-10-14 19:34:06 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2013-10-14 19:34:06 +0200 |
commit | d0b48ec996cb20f05f5c7b0059eddf0da9198de0 (patch) | |
tree | aadf4957fa380fc70947267218e5a5bc91c396f9 /src/lj_tab.h | |
parent | 4ccb2dd3bb576f742f987cf0027214e733325404 (diff) | |
parent | 5d25645a210f32dddecde9c50afb14f9ee63e180 (diff) | |
download | luajit-d0b48ec996cb20f05f5c7b0059eddf0da9198de0.tar.gz luajit-d0b48ec996cb20f05f5c7b0059eddf0da9198de0.tar.bz2 luajit-d0b48ec996cb20f05f5c7b0059eddf0da9198de0.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_tab.h')
-rw-r--r-- | src/lj_tab.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lj_tab.h b/src/lj_tab.h index c57bdd82..5ec73286 100644 --- 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); | |||
40 | #endif | 40 | #endif |
41 | LJ_FUNCA GCtab * LJ_FASTCALL lj_tab_dup(lua_State *L, const GCtab *kt); | 41 | LJ_FUNCA GCtab * LJ_FASTCALL lj_tab_dup(lua_State *L, const GCtab *kt); |
42 | LJ_FUNC void LJ_FASTCALL lj_tab_free(global_State *g, GCtab *t); | 42 | LJ_FUNC void LJ_FASTCALL lj_tab_free(global_State *g, GCtab *t); |
43 | #if LJ_HASFFI | ||
44 | LJ_FUNC void lj_tab_rehash(lua_State *L, GCtab *t); | ||
45 | #endif | ||
43 | LJ_FUNCA void lj_tab_reasize(lua_State *L, GCtab *t, uint32_t nasize); | 46 | LJ_FUNCA void lj_tab_reasize(lua_State *L, GCtab *t, uint32_t nasize); |
44 | 47 | ||
45 | /* Caveat: all getters except lj_tab_get() can return NULL! */ | 48 | /* Caveat: all getters except lj_tab_get() can return NULL! */ |