Make allocator threadsafe by default when running LuaJIT, because LuaJIT allocator is not

1 files changed, 8 insertions, 8 deletions

diff --git a/src/keeper.c b/src/keeper.c
index 6b3a810..3211c1b 100644
--- a/src/keeper.c
+++ b/src/keeper.c
@@ -612,14 +612,14 @@ void close_keepers( Universe* U, lua_State* L)
         // free the keeper bookkeeping structure
         {
             // don't hijack the state allocator when running LuaJIT because it looks like LuaJIT does not expect it and might invalidate the memory unexpectedly
-#if LUAJIT_FLAVOR == 0
+#if USE_LUA_STATE_ALLOCATOR
             {
                 AllocatorDefinition* const allocD = &U->protected_allocator.definition;
-                allocD->allocF( allocUD, U->keepers, sizeof( Keepers) + (nbKeepers - 1) * sizeof( Keeper), 0);
+                allocD->allocF( allocD->allocUD, U->keepers, sizeof( Keepers) + (nbKeepers - 1) * sizeof( Keeper), 0);
             }
-#else // LUAJIT_FLAVOR
+#else // USE_LUA_STATE_ALLOCATOR
             free(U->keepers);
-#endif // LUAJIT_FLAVOR
+#endif // USE_LUA_STATE_ALLOCATOR
             U->keepers = NULL;
         }
     }
@@ -654,14 +654,14 @@ void init_keepers( Universe* U, lua_State* L)
     {
         size_t const bytes = sizeof( Keepers) + (nb_keepers - 1) * sizeof( Keeper);
         // don't hijack the state allocator when running LuaJIT because it looks like LuaJIT does not expect it and might invalidate the memory unexpectedly
-#if LUAJIT_FLAVOR == 0
+#if USE_LUA_STATE_ALLOCATOR
         {
             AllocatorDefinition* const allocD = &U->protected_allocator.definition;
-            U->keepers = (Keepers*) allocD->allocF( allocUD, NULL, 0, bytes);
+            U->keepers = (Keepers*) allocD->allocF( allocD->allocUD, NULL, 0, bytes);
         }
-#else // LUAJIT_FLAVOR
+#else // USE_LUA_STATE_ALLOCATOR
         U->keepers = (Keepers*)malloc(bytes);
-#endif // LUAJIT_FLAVOR
+#endif // USE_LUA_STATE_ALLOCATOR
         if( U->keepers == NULL)
         {
             (void) luaL_error( L, "init_keepers() failed while creating keeper array; out of memory");