Clean macros in platform.h

* Remove unused macros ultoa, SIGNED. * Move macros NOMINMAX and WIN32_LEAN_AND_MEAN to host.h because they are used when including windows.h. Signed-off-by: Stefan Weil <[email protected]>
tesseract-ocr · Apr 22, 2019 · 53f1265 · 53f1265
1 parent 3bd61bf
commit 53f1265
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/src/ccutil/host.h b/src/ccutil/host.h
@@ -22,6 +22,12 @@
 #include "platform.h"
 /* _WIN32 */
 #ifdef _WIN32
+#  ifndef NOMINMAX
+#    define NOMINMAX
+#  endif /* NOMINMAX */
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
 #include <windows.h>
 #undef min
 #undef max

diff --git a/src/ccutil/platform.h b/src/ccutil/platform.h
@@ -19,18 +19,7 @@
 #define TESSERACT_CCUTIL_PLATFORM_H_
 
 #define DLLSYM
-#ifdef _WIN32
-#  ifndef NOMINMAX
-#    define NOMINMAX
-#  endif /* NOMINMAX */
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  ifdef __GNUC__
-#    define ultoa _ultoa
-#  endif /* __GNUC__ */
-#  define SIGNED
-#else
+#ifndef _WIN32
 #  ifdef __cplusplus
 #    include <climits>
 #  else /* C compiler*/
@@ -41,7 +30,6 @@
 #  else
 #    define MAX_PATH PATH_MAX
 #  endif
-#  define SIGNED signed
 #endif
 
 #if defined(_WIN32) || defined(__CYGWIN__)