Merge branch 'master' into v2.1

2014-04-22 11:29:05 +02:00
parent 39acdb8b7f 2715fe3aee
commit c8d1aff0ba
5 changed files with 9 additions and 6 deletions
--- a/src/lj_state.c
+++ b/src/lj_state.c
@@ -178,7 +178,7 @@ static void close_state(lua_State *L)
    g->allocf(g->allocd, G2GG(g), sizeof(GG_State), 0);
 }

-#if LJ_64
+#if LJ_64 && !(defined(LUAJIT_USE_VALGRIND) && defined(LUAJIT_USE_SYSMALLOC))
 lua_State *lj_state_newstate(lua_Alloc f, void *ud)
 #else
 LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud)