Do not define or use macro __UNIX__

Either it was not needed, or it could be replaced by checking
for not _WIN32.

This fixes a compiler warning from clang:

src/ccutil/platform.h:41:9: warning:
 macro name is a reserved identifier [-Wreserved-id-macro]

Signed-off-by: Stefan Weil <[email protected]>

Author: stweil

src/ccmain/control.cpp

@@ -27,9 +27,6 @@
 #include <cstdint>               // for int16_t, int32_t
 #include <cstdio>                // for fclose, fopen, FILE
 #include <ctime>                 // for clock
-#ifdef __UNIX__
-#include <unistd.h>
-#endif
 #include <cctype>
 #include "callcpp.h"
 #include "control.h"

src/ccmain/output.cpp

@@ -20,9 +20,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <cstring>
-#ifdef __UNIX__
-#include <unistd.h>
-#endif
 #include "helpers.h"
 #include "tessvars.h"
 #include "control.h"

src/ccmain/pgedit.cpp

@@ -104,9 +104,6 @@ ScrollView* image_win;
 ParamsEditor* pe;
 bool stillRunning = false;
 
-#ifdef __UNIX__
-FILE *debug_window = nullptr;                // opened on demand
-#endif
 ScrollView* bln_word_window = nullptr;       // baseline norm words
 
 CMD_EVENTS mode = CHANGE_DISP_CMD_EVENT;  // selected words op

src/ccstruct/pdblock.cpp

@@ -198,11 +198,11 @@ void PDBLK::plot(                //draw outline
     //              tprintf("Block %d bottom left is (%d,%d)\n",
     //                      serial,startpt.x(),startpt.y());
     char temp_buff[34];
-    #if defined(__UNIX__) || defined(MINGW)
+#if !defined(_WIN32) || defined(MINGW)
     snprintf(temp_buff, sizeof(temp_buff), "%" PRId32, serial);
-    #else
+#else
     ultoa (serial, temp_buff, 10);
-    #endif
+#endif
     window->Text(startpt.x (), startpt.y (), temp_buff);
 
     window->SetCursor(startpt.x (), startpt.y ());

src/ccstruct/polyblk.cpp

@@ -250,11 +250,11 @@ void POLY_BLOCK::plot(ScrollView* window, int32_t num) {
   if (num > 0) {
     window->TextAttributes("Times", 80, false, false, false);
     char temp_buff[34];
-    #if defined(__UNIX__) || defined(MINGW)
+#if !defined(_WIN32) || defined(MINGW)
     snprintf(temp_buff, sizeof(temp_buff), "%" PRId32, num);
-    #else
+#else
     ltoa (num, temp_buff, 10);
-    #endif
+#endif
     window->Text(v.data ()->x (), v.data ()->y (), temp_buff);
   }
 

src/ccutil/errcode.cpp

@@ -21,9 +21,6 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <cstring>
-#ifdef __UNIX__
-#include <signal.h>
-#endif
 #include "tprintf.h"
 #include "errcode.h"
 

src/ccutil/mainblk.cpp

@@ -17,15 +17,13 @@
  *
  **********************************************************************/
 
-#include          "fileerr.h"
-#ifdef __UNIX__
-#include          <unistd.h>
-#include          <signal.h>
-#else
-#include          <io.h>
+#include <cstdlib>
+#if defined(_WIN32)
+#include <io.h>         // for _access
 #endif
-#include          <stdlib.h>
-#include          "ccutil.h"
+
+#include "fileerr.h"
+#include "ccutil.h"
 
 #define VARDIR        "configs/" /**< variables files */
 #define EXTERN

src/ccutil/platform.h

@@ -38,7 +38,6 @@
 #endif
 #endif /* defined(_MSC_VER) */
 #else
-#define __UNIX__
 #include <limits.h>
 #ifndef PATH_MAX
 #define MAX_PATH 4096

src/classify/adaptive.cpp

@@ -24,9 +24,7 @@
 #include "globals.h"
 #include "classify.h"
 
-#ifdef __UNIX__
 #include <cassert>
-#endif
 #include <cstdio>
 
 using tesseract::TFile;

src/classify/intproto.cpp

@@ -23,9 +23,6 @@
 #include <cmath>
 #include <cstdio>
 #include <cassert>
-#ifdef __UNIX__
-#include <unistd.h>
-#endif
 
 #include "classify.h"
 #include "callcpp.h"       // for cprintf

src/textord/fpchop.cpp

@@ -448,9 +448,7 @@ bool fixed_chop_coutline(                                  //chop the outline
       else
         break;
     }
-    //#ifdef __UNIX__
     ASSERT_HOST (head_index != tail_index);
-    //#endif
     if (!first_frag) {
       save_chop_cfragment(head_index,
                           head_pos,
@@ -480,9 +478,7 @@ bool fixed_chop_coutline(                                  //chop the outline
           tail_index = 0;
       }
       while (tail_pos.x () != chop_coord);
-      //#ifdef __UNIX__
       ASSERT_HOST (head_index != tail_index);
-      //#endif
       save_chop_cfragment(head_index,
                           head_pos,
                           tail_index,

src/wordrec/tface.cpp

@@ -28,10 +28,6 @@
 #include "params_model.h"
 
 #include <cmath>
-#ifdef __UNIX__
-#include <unistd.h>
-#endif
-
 
 namespace tesseract {