Merge pull request #980 from stweil/clean

Remove portability code which is no longer needed
tesseract-ocr · Jun 5, 2017 · 8c29e68 · 8c29e68
2 parents 22bcf4d + 1cf8fe5
commit 8c29e68
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 144 deletions.
diff --git a/api/baseapi.cpp b/api/baseapi.cpp
@@ -29,7 +29,6 @@
 #if defined(_WIN32)
 #ifdef _MSC_VER
 #include "vcsversion.h"
-#include "mathfix.h"
 #elif MINGW
 // workaround for stdlib.h with -std=c++11 for _splitpath and _MAX_FNAME
 #undef __STRICT_ANSI__

diff --git a/api/pdfrenderer.cpp b/api/pdfrenderer.cpp
@@ -28,10 +28,6 @@
 #include "strngs.h"
 #include "tprintf.h"
 
-#ifdef _MSC_VER
-#include "mathfix.h"
-#endif
-
 /*
 
 Design notes from Ken Sharp, with light editing.

diff --git a/ccmain/equationdetect.cpp b/ccmain/equationdetect.cpp
@@ -17,11 +17,6 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifdef _MSC_VER
-#pragma warning(disable:4244)  // Conversion warnings
-#include <mathfix.h>
-#endif
-
 #ifdef __MINGW32__
 #include <limits.h>
 #endif

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/classify/featdefs.cpp b/classify/featdefs.cpp
@@ -18,10 +18,6 @@
 /*-----------------------------------------------------------------------------
           Include Files and Type Defines
 -----------------------------------------------------------------------------*/
-#ifdef _MSC_VER
-#include <mathfix.h>
-#endif
-
 #include "featdefs.h"
 #include "emalloc.h"
 #include "danerror.h"

diff --git a/vs2010/port/mathfix.h b/vs2010/port/mathfix.h
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