Skip to content

Commit d81fa42

Browse files
committed
mingw: drop the build-system plumbing for nedmalloc
With the previous commit removing every opt-in, the remaining build-system plumbing for nedmalloc is dead code. Remove it so the next commit's deletion of compat/nedmalloc/ is a pure file removal. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent f9f69ef commit d81fa42

4 files changed

Lines changed: 0 additions & 21 deletions

File tree

Makefile

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -283,13 +283,9 @@ include shared.mak
283283
# Define SKIP_DASHED_BUILT_INS if you do not need the dashed versions of the
284284
# built-ins to be linked/copied at all.
285285
#
286-
# Define USE_NED_ALLOCATOR if you want to replace the platforms default
287-
# memory allocators with the nedmalloc allocator written by Niall Douglas.
288-
#
289286
# Define OVERRIDE_STRDUP to override the libc version of strdup(3).
290287
# This is necessary when using a custom allocator in order to avoid
291288
# crashes due to allocation and free working on different 'heaps'.
292-
# It's defined automatically if USE_NED_ALLOCATOR is set.
293289
#
294290
# Define NO_REGEX if your C library lacks regex support with REG_STARTEND
295291
# feature.
@@ -1511,7 +1507,6 @@ BUILTIN_OBJS += builtin/write-tree.o
15111507
# upstream unnecessarily (making merging in future changes easier).
15121508
THIRD_PARTY_SOURCES += compat/inet_ntop.c
15131509
THIRD_PARTY_SOURCES += compat/inet_pton.c
1514-
THIRD_PARTY_SOURCES += compat/nedmalloc/%
15151510
THIRD_PARTY_SOURCES += compat/obstack.%
15161511
THIRD_PARTY_SOURCES += compat/poll/%
15171512
THIRD_PARTY_SOURCES += compat/regex/%
@@ -2267,12 +2262,6 @@ ifdef NATIVE_CRLF
22672262
BASIC_CFLAGS += -DNATIVE_CRLF
22682263
endif
22692264

2270-
ifdef USE_NED_ALLOCATOR
2271-
COMPAT_CFLAGS += -Icompat/nedmalloc
2272-
COMPAT_OBJS += compat/nedmalloc/nedmalloc.o
2273-
OVERRIDE_STRDUP = YesPlease
2274-
endif
2275-
22762265
ifdef OVERRIDE_STRDUP
22772266
COMPAT_CFLAGS += -DOVERRIDE_STRDUP
22782267
COMPAT_OBJS += compat/strdup.o
@@ -2983,12 +2972,6 @@ compat/regex/regex.sp compat/regex/regex.o: EXTRA_CPPFLAGS = \
29832972
-DGAWK -DNO_MBSUPPORT
29842973
endif
29852974

2986-
ifdef USE_NED_ALLOCATOR
2987-
compat/nedmalloc/nedmalloc.sp compat/nedmalloc/nedmalloc.o: EXTRA_CPPFLAGS = \
2988-
-DNDEBUG -DREPLACE_SYSTEM_ALLOCATOR
2989-
compat/nedmalloc/nedmalloc.sp: SP_EXTRA_FLAGS += -Wno-non-pointer-null
2990-
endif
2991-
29922975
headless-git.o: compat/win32/headless.c GIT-CFLAGS
29932976
$(QUIET_CC)$(CC) $(ALL_CFLAGS) $(COMPAT_CFLAGS) \
29942977
-fno-stack-protector -o $@ -c -Wall -Wwrite-strings $<

config.mak.uname

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,6 @@ ifeq ($(uname_S),Windows)
491491
USE_WIN32_IPC = YesPlease
492492
USE_WIN32_MMAP = YesPlease
493493
MMAP_PREVENTS_DELETE = UnfortunatelyYes
494-
# USE_NED_ALLOCATOR = YesPlease
495494
UNRELIABLE_FSTAT = UnfortunatelyYes
496495
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
497496
NO_REGEX = YesPlease

contrib/vscode/init.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ cat >.vscode/settings.json.new <<\EOF ||
202202
"\\bUSE_STDEV\\b",
203203
"\\Wchar *\\*\\W*utfs\\W",
204204
"cURL's",
205-
"nedmalloc'ed",
206205
"ntifs\\.h",
207206
],
208207
}

meson.build

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,6 @@ third_party_excludes = [
698698
':!contrib',
699699
':!compat/inet_ntop.c',
700700
':!compat/inet_pton.c',
701-
':!compat/nedmalloc',
702701
':!compat/obstack.*',
703702
':!compat/poll',
704703
':!compat/regex',
@@ -1285,7 +1284,6 @@ elif host_machine.system() == 'windows'
12851284
'compat/win32/pthread.c',
12861285
'compat/win32/syslog.c',
12871286
'compat/win32mmap.c',
1288-
'compat/nedmalloc/nedmalloc.c',
12891287
]
12901288

12911289
libgit_c_args += [

0 commit comments

Comments
 (0)