Remove local implementation of strtok_r

MS Visual Studio does not provide that function, but can use strtok_s which does exactly the same. Signed-off-by: Stefan Weil <[email protected]>
tesseract-ocr · Jun 5, 2017 · 5f8ecdb · 5f8ecdb
1 parent 22bcf4d
commit 5f8ecdb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 92 deletions.
diff --git a/ccutil/Makefile.am b/ccutil/Makefile.am
@@ -42,7 +42,5 @@ libtesseract_ccutil_la_SOURCES = \
     params.cpp universalambigs.cpp
 
 if T_WIN
-AM_CPPFLAGS += -I$(top_srcdir)/vs2010/port -DWINDLLNAME=\"lib@GENERIC_LIBRARY_NAME@\"
-noinst_HEADERS += ../vs2010/port/strtok_r.h
-libtesseract_ccutil_la_SOURCES += ../vs2010/port/strtok_r.cpp
+AM_CPPFLAGS += -DWINDLLNAME=\"lib@GENERIC_LIBRARY_NAME@\"
 endif
diff --git a/ccutil/ambigs.cpp b/ccutil/ambigs.cpp
@@ -24,13 +24,9 @@
 #include "helpers.h"
 #include "universalambigs.h"
 
-#if defined _WIN32
-#ifndef __GNUC__
-#define strtok_r strtok_s
-#else
-#include "strtok_r.h"
-#endif  /* __GNUC__ */
-#endif  /* _WIN32 */
+#if defined(_WIN32) && !defined(__GNUC__)
+# define strtok_r(str, delim, saveptr) strtok_s(str, delim, saveptr)
+#endif  /* _WIN32 && !__GNUC__ */
 
 namespace tesseract {
 

diff --git a/vs2010/port/strtok_r.cpp b/vs2010/port/strtok_r.cpp
diff --git a/vs2010/port/strtok_r.h b/vs2010/port/strtok_r.h