3 files changed, 0 insertions, 26 deletions
diff --git a/src/include/dynarec_native.h b/src/include/dynarec_native.h
index c5bca0a4..f3f2bd70 100644
--- a/src/include/dynarec_native.h
+++ b/src/include/dynarec_native.h
@@ -5,20 +5,6 @@ typedef struct dynablock_s dynablock_t;
 typedef struct x64emu_s x64emu_t;
 typedef struct instsize_s instsize_t;
 
-
-//#define USE_CUSTOM_MEM
-#ifdef USE_CUSTOM_MEM
-#define dynaMalloc customMalloc
-#define dynaCalloc customCalloc
-#define dynaRealloc customRealloc
-#define dynaFree customFree
-#else
-#define dynaMalloc box_malloc
-#define dynaCalloc box_calloc
-#define dynaRealloc box_realloc
-#define dynaFree box_free
-#endif
-
 #define MAX_INSTS   32760
 
 void addInst(instsize_t* insts, size_t* size, int x64_size, int native_size);
diff --git a/src/libtools/signal32.c b/src/libtools/signal32.c
index b1fc9454..99e09434 100644
--- a/src/libtools/signal32.c
+++ b/src/libtools/signal32.c
@@ -362,12 +362,6 @@ uint32_t RunFunctionHandler32(int* exit, int dynarec, i386_ucontext_t* sigcontex
     trace_start = 0; trace_end = 1; // disabling trace, globably for now...
 #endif
 #endif
-#ifndef USE_CUSTOM_MEM
-    // because a signal can interupt a malloc-like function
-    // Dynarec cannot be used in signal handling unless custom malloc is used
-    dynarec = 0;
-#endif
-
     x64emu_t *emu = thread_get_emu();
     #ifdef DYNAREC
     if (BOX64ENV(dynarec_test))
diff --git a/src/libtools/signals.c b/src/libtools/signals.c
index ad7d085f..527d9510 100644
--- a/src/libtools/signals.c
+++ b/src/libtools/signals.c
@@ -116,12 +116,6 @@ uint64_t RunFunctionHandler(x64emu_t* emu, int* exit, int dynarec, x64_ucontext_
     trace_start = 0; trace_end = 1; // disabling trace, globably for now...
 #endif
 #endif
-#ifndef USE_CUSTOM_MEM
-    // because a signal can interupt a malloc-like function
-    // Dynarec cannot be used in signal handling unless custom malloc is used
-    if(dynarec==1)
-        dynarec = 0;
-#endif
     if(!emu)
         emu = thread_get_emu();
     #ifdef DYNAREC