summaryrefslogtreecommitdiff
path: root/src/lj_state.c
diff options
context:
space:
mode:
authorMike Pall <mike>2014-04-22 11:29:05 +0200
committerMike Pall <mike>2014-04-22 11:29:05 +0200
commitc8d1aff0bafcbfadb4a119685708c19788158cd6 (patch)
tree9501d4b89549058b727c386aac980da075df4995 /src/lj_state.c
parent39acdb8b7f8542373d6a47538f9a712baa8fe7d6 (diff)
parent2715fe3aee7c8202b4b5d04748d1c5faa6d8fd9c (diff)
downloadluajit-c8d1aff0bafcbfadb4a119685708c19788158cd6.tar.gz
luajit-c8d1aff0bafcbfadb4a119685708c19788158cd6.tar.bz2
luajit-c8d1aff0bafcbfadb4a119685708c19788158cd6.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_state.c')
-rw-r--r--src/lj_state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_state.c b/src/lj_state.c
index 73611ac8..444f269d 100644
--- a/src/lj_state.c
+++ b/src/lj_state.c
@@ -178,7 +178,7 @@ static void close_state(lua_State *L)
178 g->allocf(g->allocd, G2GG(g), sizeof(GG_State), 0); 178 g->allocf(g->allocd, G2GG(g), sizeof(GG_State), 0);
179} 179}
180 180
181#if LJ_64 181#if LJ_64 && !(defined(LUAJIT_USE_VALGRIND) && defined(LUAJIT_USE_SYSMALLOC))
182lua_State *lj_state_newstate(lua_Alloc f, void *ud) 182lua_State *lj_state_newstate(lua_Alloc f, void *ud)
183#else 183#else
184LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud) 184LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud)