aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorErik Faye-Lund <kusmabite@gmail.com>2013-02-26 17:58:38 +0100
committerJunio C Hamano <gitster@pobox.com>2013-02-26 09:16:58 -0800
commit13a23199195bb29d7f9e64baaa35c1718a92c556 (patch)
treecfea7431fa498b21cb1c9ac8195fb1808a68fa7f /Makefile
parent4dac0679feaebbf6545daec14480cf6b94cb74ed (diff)
downloadgit-13a23199195bb29d7f9e64baaa35c1718a92c556.tar.gz
git-13a23199195bb29d7f9e64baaa35c1718a92c556.tar.xz
Revert "compat: add strtok_r()"
This reverts commit 78457bc0ccc1af8b9eb776a0b17986ebd50442bc. commit 28c5d9e ("vcs-svn: drop string_pool") previously removed the only call-site for strtok_r. So let's get rid of the compat implementation as well. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 0 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 7c75e3b10..26d333275 100644
--- a/Makefile
+++ b/Makefile
@@ -101,8 +101,6 @@ all::
#
# Define NO_MKSTEMPS if you don't have mkstemps in the C library.
#
-# Define NO_STRTOK_R if you don't have strtok_r in the C library.
-#
# Define NO_FNMATCH if you don't have fnmatch in the C library.
#
# Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the
@@ -1249,10 +1247,6 @@ endif
ifdef NO_STRTOULL
COMPAT_CFLAGS += -DNO_STRTOULL
endif
-ifdef NO_STRTOK_R
- COMPAT_CFLAGS += -DNO_STRTOK_R
- COMPAT_OBJS += compat/strtok_r.o
-endif
ifdef NO_FNMATCH
COMPAT_CFLAGS += -Icompat/fnmatch
COMPAT_CFLAGS += -DNO_FNMATCH