From 6c773e00d77ff2b9f999a34943532a28bd2aab5c Mon Sep 17 00:00:00 2001
From: Matt Messier <matt@crashoverride.com>
Date: Thu, 12 Jan 2023 08:11:18 -0500
Subject: [PATCH] Add an option to disable internal malloc

---
 src/lj_alloc.c | 2 +-
 src/lj_state.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lj_alloc.c b/src/lj_alloc.c
index 20e60493..4d65d170 100644
--- a/src/lj_alloc.c
+++ b/src/lj_alloc.c
@@ -33,7 +33,7 @@
 #include "lj_alloc.h"
 #include "lj_prng.h"
 
-#ifndef LUAJIT_USE_SYSMALLOC
+#if !defined(LUAJIT_USE_SYSMALLOC) && !defined(LUAJIT_DISABLE_DLMALLOC)
 
 #define MAX_SIZE_T		(~(size_t)0)
 #define MALLOC_ALIGNMENT	((size_t)8U)
diff --git a/src/lj_state.c b/src/lj_state.c
index 0b9c46ba..72b41883 100644
--- a/src/lj_state.c
+++ b/src/lj_state.c
@@ -184,7 +184,7 @@ static void close_state(lua_State *L)
   lj_assertG(g->gc.total == sizeof(GG_State),
 	     "memory leak of %lld bytes",
 	     (long long)(g->gc.total - sizeof(GG_State)));
-#ifndef LUAJIT_USE_SYSMALLOC
+#if !defined(LUAJIT_USE_SYSMALLOC) && !defined(LUAJIT_DISABLE_DLMALLOC)
   if (g->allocf == lj_alloc_f)
     lj_alloc_destroy(g->allocd);
   else
@@ -208,7 +208,7 @@ LUA_API lua_State *lua_newstate(lua_Alloc allocf, void *allocd)
     /* Can only return NULL here, so this errors with "not enough memory". */
     return NULL;
   }
-#ifndef LUAJIT_USE_SYSMALLOC
+#if !defined(LUAJIT_USE_SYSMALLOC) && !defined(LUAJIT_DISABLE_DLMALLOC)
   if (allocf == LJ_ALLOCF_INTERNAL) {
     allocd = lj_alloc_create(&prng);
     if (!allocd) return NULL;
@@ -230,7 +230,7 @@ LUA_API lua_State *lua_newstate(lua_Alloc allocf, void *allocd)
   g->allocf = allocf;
   g->allocd = allocd;
   g->prng = prng;
-#ifndef LUAJIT_USE_SYSMALLOC
+#if !defined(LUAJIT_USE_SYSMALLOC) && !defined(LUAJIT_DISABLE_DLMALLOC)
   if (allocf == lj_alloc_f) {
     lj_alloc_setprng(allocd, &g->prng);
   }