CMake: Don't check for windows.h or winsock2.h.

If we're building on Windows we're going to have windows.h and
winsock2.h. Don't bother checking for them.

Change-Id: I0004c44d7364ab3f41682f34b8c84cd8617c9603
Reviewed-on: https://code.wireshark.org/review/24068
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

ConfigureChecks.cmake

@@ -51,8 +51,6 @@ check_include_file("sys/types.h"         HAVE_SYS_TYPES_H)
 check_include_file("sys/utsname.h"       HAVE_SYS_UTSNAME_H)
 check_include_file("sys/wait.h"          HAVE_SYS_WAIT_H)
 check_include_file("unistd.h"            HAVE_UNISTD_H)
-check_include_file("windows.h"           HAVE_WINDOWS_H)
-check_include_file("winsock2.h"          HAVE_WINSOCK2_H)
 
 #
 # On Linux, check for some additional headers, which we need as a

caputils/airpcap.h

@@ -27,7 +27,7 @@
 #pragma warning( disable : 4996)
 #endif
 
-#ifdef HAVE_WINSOCK2_H
+#ifdef _WIN32
 #include <winsock2.h>
 #endif
 

cmakeconfig.h.in

@@ -363,12 +363,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine HAVE_UNISTD_H 1
 
-/* Define to 1 if you have the <windows.h> header file. */
-#cmakedefine HAVE_WINDOWS_H 1
-
-/* Define to 1 if you have the <winsock2.h> header file. */
-#cmakedefine HAVE_WINSOCK2_H 1
-
 /* Name of package */
 #cmakedefine PACKAGE
 

editcap.c

@@ -66,10 +66,8 @@
 #ifdef _WIN32
 #include <wsutil/unicode-utils.h>
 #include <process.h>    /* getpid */
-#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif
-#endif
 
 #ifndef HAVE_STRPTIME
 # include "wsutil/strptime.h"

epan/addr_resolv.c

@@ -76,12 +76,9 @@
 #include <sys/socket.h>     /* needed to define AF_ values on UNIX */
 #endif
 
-#ifdef HAVE_WINSOCK2_H
-#include <winsock2.h>       /* needed to define AF_ values on Windows */
-#endif
-
 #ifdef _WIN32
-# include <ws2tcpip.h>
+#include <winsock2.h>       /* needed to define AF_ values on Windows */
+#include <ws2tcpip.h>
 #endif
 
 #ifdef HAVE_C_ARES

epan/dissectors/packet-lbm.h

@@ -98,7 +98,7 @@
 # include <netinet/in.h>
 #endif
 
-#ifdef HAVE_WINSOCK2_H
+#ifdef _WIN32
 #include <winsock2.h>
 #endif
 

file.c

@@ -83,11 +83,8 @@
 # include <netdb.h>
 #endif
 
-#ifdef HAVE_WINSOCK2_H
-# include <winsock2.h>
-#endif
-
 #ifdef _WIN32
+# include <winsock2.h>
 # include <ws2tcpip.h>
 #endif
 

tshark.c

@@ -36,7 +36,7 @@
 
 #include <errno.h>
 
-#ifdef HAVE_WINSOCK2_H
+#ifdef _WIN32
 # include <winsock2.h>
 #endif
 

ui/tap-sctp-analysis.h

@@ -34,10 +34,8 @@ extern "C" {
 #include <sys/socket.h>
 #include <netinet/in.h>
 #else
-#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif
-#endif
 
 #define CHUNK_TYPE_LENGTH	      1
 #define CHUNK_FLAGS_LENGTH	      1

ui/util.c

@@ -32,7 +32,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
+#ifdef _WIN32
 #include <windows.h>
 #endif
 

wiretap/wtap-int.h

@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <time.h>
 
-#ifdef HAVE_WINSOCK2_H
+#ifdef _WIN32
 #include <winsock2.h>
 #endif
 

wsutil/socket.h

@@ -25,16 +25,9 @@
 #define __SOCKET_H__
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
-	#ifdef HAVE_WINDOWS_H
-		#include <windows.h>
-	#endif
-
+	#include <windows.h>
 	#include <ws2tcpip.h>
-
-	#ifdef HAVE_WINSOCK2_H
-		#include <winsock2.h>
-	#endif
-
+	#include <winsock2.h>
 	#include <process.h>
 
 	#define socket_handle_t SOCKET

wsutil/tempfile.c

@@ -26,11 +26,8 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#ifdef HAVE_WINDOWS_H
-#include <windows.h>
-#endif
-
 #ifdef _WIN32
+#include <windows.h>
 #include <process.h>    /* For getpid() */
 #endif