strsep is in upstream BusyBox: no need for MINGW32 versionmerge_1_19

3 files changed, 1 insertions, 22 deletions

diff --git a/include/mingw.h b/include/mingw.h
index 33f83e3ab..0b64c52ec 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -157,10 +157,6 @@ int setenv(const char *name, const char *value, int replace);
 void unsetenv(const char *env);
 
 #define getenv mingw_getenv
-/*
- * string.h
- */
-char *strsep(char **stringp, const char *delim);
 
 /*
  * sys/ioctl.h
diff --git a/include/platform.h b/include/platform.h
index 713e76d04..88e8acb7a 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -401,6 +401,7 @@ typedef unsigned smalluint;
 # undef HAVE_STPCPY
 # undef HAVE_STRCASESTR
 # undef HAVE_STRCHRNUL
+# undef HAVE_STRSEP
 # undef HAVE_STRSIGNAL
 # undef HAVE_STRVERSCMP
 # undef HAVE_VASPRINTF
diff --git a/win32/mingw.c b/win32/mingw.c
index df413d18e..ae166000e 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -641,24 +641,6 @@ int link(const char *oldpath, const char *newpath)
         return 0;
 }
 
-char *strsep(char **stringp, const char *delim)
-{
-        char *s, *old_stringp;
-        if (!*stringp)
-                return NULL;
-        old_stringp = s = *stringp;
-        while (*s) {
-                if (strchr(delim, *s)) {
-                        *s = '\0';
-                        *stringp = s+1;
-                        return old_stringp;
-                }
-                s++;
-        }
-        *stringp = NULL;
-        return old_stringp;
-}
-
 char *realpath(const char *path, char *resolved_path)
 {
         /* FIXME: need normalization */