Move unused winsock2.h includes to the end of config.h

winsock2.h must be included before windows.h, but windows.h is included by various standard C headers

compat.h

@@ -12,10 +12,6 @@
 
 #include "config.h"
 
-#ifdef WIN32
-#include <winsock2.h>
-#endif
-
 #include <stdbool.h>
 
 #if !(defined(WIN32) || defined(unix))

configure.ac

@@ -31,6 +31,12 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([miner.c])
 AC_CONFIG_HEADERS([config.h])
 
+AH_BOTTOM([
+#ifdef WIN32
+#include <winsock2.h>
+#endif
+])
+
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_USE_SYSTEM_EXTENSIONS

driver-icarus.c

@@ -32,10 +32,6 @@
 #include "config.h"
 #include "miner.h"
 
-#ifdef WIN32
-#include <winsock2.h>
-#endif
-
 #include <limits.h>
 #include <pthread.h>
 #include <stdbool.h>

driver-opencl.c

@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifdef WIN32
-#include <winsock2.h>
-#endif
-
 #ifdef HAVE_CURSES
 // Must be before stdbool, since pdcurses typedefs bool :/
 #include <curses.h>

driver-x6500.c

@@ -10,10 +10,6 @@
 
 #include "config.h"
 
-#ifdef WIN32
-#include <winsock2.h>
-#endif
-
 #include <limits.h>
 #include <math.h>
 #include <stdbool.h>

ft232r.c

@@ -9,10 +9,6 @@
 
 #include "config.h"
 
-#ifdef WIN32
-#include <winsock2.h>
-#endif
-
 #include <errno.h>
 #include <stdbool.h>
 #include <stdint.h>

jtag.c

@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifdef WIN32
-#include <winsock2.h>
-#endif
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>

lowl-hid.c

@@ -13,7 +13,6 @@
 #include <dlfcn.h>
 typedef void *dlh_t;
 #else
-#include <winsock2.h>
 #include <windows.h>
 #define dlopen(lib, flags) LoadLibrary(lib)
 #define dlsym(h, sym)  ((void*)GetProcAddress(h, sym))

lowl-vcom.c

@@ -12,10 +12,6 @@
 
 #include "config.h"
 
-#ifdef WIN32
-#include <winsock2.h>
-#endif
-
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdbool.h>

ocl.c

@@ -19,14 +19,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#ifdef WIN32
-	#include <winsock2.h>
-#else
-	#include <sys/socket.h>
-	#include <netinet/in.h>
-	#include <netdb.h>
-#endif
-
 #include <time.h>
 #include <sys/time.h>
 #include <pthread.h>