Skip to content

Commit 13a2319

Browse files
kusmagitster
authored andcommitted
Revert "compat: add strtok_r()"
This reverts commit 78457bc. 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 <[email protected]> Reviewed-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4dac067 commit 13a2319

File tree

5 files changed

+0
-80
lines changed

5 files changed

+0
-80
lines changed

Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ all::
101101
#
102102
# Define NO_MKSTEMPS if you don't have mkstemps in the C library.
103103
#
104-
# Define NO_STRTOK_R if you don't have strtok_r in the C library.
105-
#
106104
# Define NO_FNMATCH if you don't have fnmatch in the C library.
107105
#
108106
# Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the
@@ -1249,10 +1247,6 @@ endif
12491247
ifdef NO_STRTOULL
12501248
COMPAT_CFLAGS += -DNO_STRTOULL
12511249
endif
1252-
ifdef NO_STRTOK_R
1253-
COMPAT_CFLAGS += -DNO_STRTOK_R
1254-
COMPAT_OBJS += compat/strtok_r.o
1255-
endif
12561250
ifdef NO_FNMATCH
12571251
COMPAT_CFLAGS += -Icompat/fnmatch
12581252
COMPAT_CFLAGS += -DNO_FNMATCH

compat/strtok_r.c

Lines changed: 0 additions & 61 deletions
This file was deleted.

config.mak.uname

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ ifeq ($(uname_S),Windows)
321321
NO_UNSETENV = YesPlease
322322
NO_STRCASESTR = YesPlease
323323
NO_STRLCPY = YesPlease
324-
NO_STRTOK_R = YesPlease
325324
NO_FNMATCH = YesPlease
326325
NO_MEMMEM = YesPlease
327326
# NEEDS_LIBICONV = YesPlease
@@ -476,7 +475,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
476475
NO_UNSETENV = YesPlease
477476
NO_STRCASESTR = YesPlease
478477
NO_STRLCPY = YesPlease
479-
NO_STRTOK_R = YesPlease
480478
NO_FNMATCH = YesPlease
481479
NO_MEMMEM = YesPlease
482480
NEEDS_LIBICONV = YesPlease

configure.ac

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -901,12 +901,6 @@ GIT_CHECK_FUNC(strcasestr,
901901
[NO_STRCASESTR=YesPlease])
902902
GIT_CONF_SUBST([NO_STRCASESTR])
903903
#
904-
# Define NO_STRTOK_R if you don't have strtok_r
905-
GIT_CHECK_FUNC(strtok_r,
906-
[NO_STRTOK_R=],
907-
[NO_STRTOK_R=YesPlease])
908-
GIT_CONF_SUBST([NO_STRTOK_R])
909-
#
910904
# Define NO_FNMATCH if you don't have fnmatch
911905
GIT_CHECK_FUNC(fnmatch,
912906
[NO_FNMATCH=],

git-compat-util.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -421,11 +421,6 @@ extern uintmax_t gitstrtoumax(const char *, char **, int);
421421
extern intmax_t gitstrtoimax(const char *, char **, int);
422422
#endif
423423

424-
#ifdef NO_STRTOK_R
425-
#define strtok_r gitstrtok_r
426-
extern char *gitstrtok_r(char *s, const char *delim, char **save_ptr);
427-
#endif
428-
429424
#ifdef NO_HSTRERROR
430425
#define hstrerror githstrerror
431426
extern const char *githstrerror(int herror);

0 commit comments

Comments
 (0)