svutil.cpp: fix windows build

tesseract-ocr · Apr 23, 2019 · 129fe95 · stweil · Apr 24, 2019 · stweil
1 parent 7bacc88
commit 129fe95
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/src/viewer/svutil.cpp b/src/viewer/svutil.cpp
@@ -19,17 +19,23 @@
 // SVUtil contains the SVSync and SVNetwork classes, which are used for
 // thread/process creation & synchronization and network connection.
 
+// Include automatically generated configuration file if running autoconf.
+#ifdef HAVE_CONFIG_H
+#  include "config_auto.h"
+#endif
+
+#include "svutil.h"
 #include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
+
 #ifdef _WIN32
 #pragma comment(lib, "Ws2_32.lib")
-struct addrinfo {
-  struct sockaddr* ai_addr;
-  int ai_addrlen;
-  int ai_family;
-  int ai_socktype;
-  int ai_protocol;
-};
-#include <winsock2.h>   // for fd_set, send, ...
+#  include <WinSock2.h>  // for fd_set, send, ..
 #else
 #include <arpa/inet.h>
 #include <netdb.h>
@@ -45,20 +51,6 @@ struct addrinfo {
 #include <unistd.h>
 #endif
 
-#include <cstdlib>
-#include <cstring>
-#include <iostream>
-#include <memory>
-#include <string>
-#include <vector>
-
-// Include automatically generated configuration file if running autoconf.
-#ifdef HAVE_CONFIG_H
-#include "config_auto.h"
-#endif
-
-#include "svutil.h"
-
 SVMutex::SVMutex() {
 #ifdef _WIN32
   mutex_ = CreateMutex(0, FALSE, 0);

diff --git a/src/viewer/svutil.h b/src/viewer/svutil.h
@@ -24,7 +24,7 @@
 #define TESSERACT_VIEWER_SVUTIL_H_
 
 #ifdef _WIN32
-#include "host.h"       // also includes windows.h
+#  include "host.h"  // also includes windows.h
 #else
 #include <pthread.h>
 #include <semaphore.h>