diff options
author | Mike Pall <mike> | 2016-06-03 06:42:35 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2016-06-03 06:52:53 +0200 |
commit | 58ca165737363af4800683577f2a6cc92e640dcc (patch) | |
tree | d55f22202888145d1c60da5c81de26a29f0d88ad /src/lj_state.c | |
parent | 7d4340230468dc0436d761da0aaa6dc18f572bec (diff) | |
download | luajit-58ca165737363af4800683577f2a6cc92e640dcc.tar.gz luajit-58ca165737363af4800683577f2a6cc92e640dcc.tar.bz2 luajit-58ca165737363af4800683577f2a6cc92e640dcc.zip |
LJ_GC64: Allow optional use of the system memory allocator.
Diffstat (limited to 'src/lj_state.c')
-rw-r--r-- | src/lj_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_state.c b/src/lj_state.c index 66bf439f..a3bfc45e 100644 --- a/src/lj_state.c +++ b/src/lj_state.c | |||
@@ -180,7 +180,7 @@ static void close_state(lua_State *L) | |||
180 | g->allocf(g->allocd, G2GG(g), sizeof(GG_State), 0); | 180 | g->allocf(g->allocd, G2GG(g), sizeof(GG_State), 0); |
181 | } | 181 | } |
182 | 182 | ||
183 | #if LJ_64 && !(defined(LUAJIT_USE_VALGRIND) && defined(LUAJIT_USE_SYSMALLOC)) | 183 | #if LJ_64 && !LJ_GC64 && !(defined(LUAJIT_USE_VALGRIND) && defined(LUAJIT_USE_SYSMALLOC)) |
184 | lua_State *lj_state_newstate(lua_Alloc f, void *ud) | 184 | lua_State *lj_state_newstate(lua_Alloc f, void *ud) |
185 | #else | 185 | #else |
186 | LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud) | 186 | LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud) |