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/lib_aux.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/lib_aux.c')
-rw-r--r-- | src/lib_aux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib_aux.c b/src/lib_aux.c index 0e61d951..d6f56e30 100644 --- a/src/lib_aux.c +++ b/src/lib_aux.c | |||
@@ -302,7 +302,7 @@ static int panic(lua_State *L) | |||
302 | 302 | ||
303 | #ifdef LUAJIT_USE_SYSMALLOC | 303 | #ifdef LUAJIT_USE_SYSMALLOC |
304 | 304 | ||
305 | #if LJ_64 && !defined(LUAJIT_USE_VALGRIND) | 305 | #if LJ_64 && !LJ_GC64 && !defined(LUAJIT_USE_VALGRIND) |
306 | #error "Must use builtin allocator for 64 bit target" | 306 | #error "Must use builtin allocator for 64 bit target" |
307 | #endif | 307 | #endif |
308 | 308 | ||
@@ -334,7 +334,7 @@ LUALIB_API lua_State *luaL_newstate(void) | |||
334 | lua_State *L; | 334 | lua_State *L; |
335 | void *ud = lj_alloc_create(); | 335 | void *ud = lj_alloc_create(); |
336 | if (ud == NULL) return NULL; | 336 | if (ud == NULL) return NULL; |
337 | #if LJ_64 | 337 | #if LJ_64 && !LJ_GC64 |
338 | L = lj_state_newstate(lj_alloc_f, ud); | 338 | L = lj_state_newstate(lj_alloc_f, ud); |
339 | #else | 339 | #else |
340 | L = lua_newstate(lj_alloc_f, ud); | 340 | L = lua_newstate(lj_alloc_f, ud); |
@@ -343,7 +343,7 @@ LUALIB_API lua_State *luaL_newstate(void) | |||
343 | return L; | 343 | return L; |
344 | } | 344 | } |
345 | 345 | ||
346 | #if LJ_64 | 346 | #if LJ_64 && !LJ_GC64 |
347 | LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud) | 347 | LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud) |
348 | { | 348 | { |
349 | UNUSED(f); UNUSED(ud); | 349 | UNUSED(f); UNUSED(ud); |