From 6c6253c9e20e43535dbf1a0b9dcd4acd924c08bc Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Thu, 10 Aug 2023 08:25:32 +0200
Subject: [PATCH] removed strtok_r compat (Win)

Mingw-w64 implements strtok_r() and the macro was commented-out, anyways
---
 configure.ac       |  1 -
 src/config_win32.h | 30 ------------------------------
 2 files changed, 31 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5003e241d..98c06c516 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,7 +300,6 @@ AC_DEFUN([DEFINE_CUDA], [
 AC_SUBST(DLL_LIBS)
 
 AC_CHECK_FUNCS(usleep)
-AC_CHECK_FUNCS(strtok_r)
 AC_CHECK_FUNCS(timespec_get)
 
 # ---------------------------------------------------------------------
diff --git a/src/config_win32.h b/src/config_win32.h
index ee14ea27c..d15edbf45 100644
--- a/src/config_win32.h
+++ b/src/config_win32.h
@@ -154,36 +154,6 @@ typedef DWORD gid_t;
 extern "C" {
 #endif
 
-// MinGW-w64 defines some broken macro for strtok_r in pthread.h
-// which can be accidently included before this resulting in compilation
-// error
-#undef strtok_r
-
-#if 0
-static inline char * strtok_r(char *str, const char *delim, char **save);
-
-/*
- * Public domain licensed code taken from:
- * http://en.wikibooks.org/wiki/C_Programming/Strings#The_strtok_function
- */
-static inline char *strtok_r(char *s, const char *delimiters, char **lasts)
-{
-     char *sbegin, *send;
-     sbegin = s ? s : *lasts;
-     sbegin += strspn(sbegin, delimiters);
-     if (*sbegin == '\0') {
-         /* *lasts = ""; */
-         *lasts = sbegin;
-         return NULL;
-     }
-     send = sbegin + strcspn(sbegin, delimiters);
-     if (*send != '\0')
-         *send++ = '\0';
-     *lasts = send;
-     return sbegin;
-}
-#endif
-
 int uname(struct utsname *);
 int getopt(int, char * const *, const char *);
 //int strncasecmp(const char *, const char*, int len);