fixup! mimalloc: offer a build-time option to enable it

Revert this in preparation for upgrading mimalloc to v2.1.2 and then
redoing this patch.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

Makefile

@@ -2076,41 +2076,6 @@ ifdef USE_NED_ALLOCATOR
 	OVERRIDE_STRDUP = YesPlease
 endif
 
-ifdef USE_MIMALLOC
-	MIMALLOC_OBJS = \
-		compat/mimalloc/alloc-aligned.o \
-		compat/mimalloc/alloc.o \
-		compat/mimalloc/arena.o \
-		compat/mimalloc/bitmap.o \
-		compat/mimalloc/heap.o \
-		compat/mimalloc/init.o \
-		compat/mimalloc/options.o \
-		compat/mimalloc/os.o \
-		compat/mimalloc/page.o \
-		compat/mimalloc/random.o \
-		compat/mimalloc/segment.o \
-		compat/mimalloc/segment-cache.o \
-		compat/mimalloc/stats.o
-
-	COMPAT_CFLAGS += -Icompat/mimalloc -DMI_DEBUG=0 -DUSE_MIMALLOC --std=gnu11
-	COMPAT_OBJS += $(MIMALLOC_OBJS)
-
-$(MIMALLOC_OBJS): COMPAT_CFLAGS += -DBANNED_H
-
-$(MIMALLOC_OBJS): COMPAT_CFLAGS += \
-	-Wno-attributes \
-	-Wno-unknown-pragmas \
-	-Wno-array-bounds
-
-ifdef DEVELOPER
-$(MIMALLOC_OBJS): COMPAT_CFLAGS += \
-	-Wno-pedantic \
-	-Wno-declaration-after-statement \
-	-Wno-old-style-definition \
-	-Wno-missing-prototypes
-endif
-endif
-
 ifdef OVERRIDE_STRDUP
 	COMPAT_CFLAGS += -DOVERRIDE_STRDUP
 	COMPAT_OBJS += compat/strdup.o

config.mak.dev

@@ -22,10 +22,8 @@ endif
 
 ifneq ($(uname_S),FreeBSD)
 ifneq ($(or $(filter gcc6,$(COMPILER_FEATURES)),$(filter clang7,$(COMPILER_FEATURES))),)
-ifndef USE_MIMALLOC
 DEVELOPER_CFLAGS += -std=gnu99
 endif
-endif
 else
 # FreeBSD cannot limit to C99 because its system headers unconditionally
 # rely on C11 features.

config.mak.uname

@@ -482,7 +482,7 @@ endif
 	CC = compat/vcbuild/scripts/clink.pl
 	AR = compat/vcbuild/scripts/lib.pl
 	CFLAGS =
-	BASIC_CFLAGS = -nologo -I. -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -MP -std:c11
+	BASIC_CFLAGS = -nologo -I. -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
 	COMPAT_OBJS = compat/msvc.o compat/winansi.o \
 		compat/win32/flush.o \
 		compat/win32/path-utils.o \

git-compat-util.h

@@ -408,16 +408,6 @@ char *gitdirname(char *);
 # include <sys/sysinfo.h>
 #endif
 
-#ifdef USE_MIMALLOC
-#include "mimalloc.h"
-#define malloc mi_malloc
-#define calloc mi_calloc
-#define realloc mi_realloc
-#define free mi_free
-#define strdup mi_strdup
-#define strndup mi_strndup
-#endif
-
 /* On most systems <netdb.h> would have given us this, but
  * not on some systems (e.g. z/OS).
  */