diff options
| -rw-r--r-- | ConfigureChecks.cmake | 2 | ||||
| -rw-r--r-- | caputils/airpcap.h | 2 | ||||
| -rw-r--r-- | cmakeconfig.h.in | 6 | ||||
| -rw-r--r-- | editcap.c | 2 | ||||
| -rw-r--r-- | epan/addr_resolv.c | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-lbm.h | 2 | ||||
| -rw-r--r-- | file.c | 5 | ||||
| -rw-r--r-- | tshark.c | 2 | ||||
| -rw-r--r-- | ui/tap-sctp-analysis.h | 2 | ||||
| -rw-r--r-- | ui/util.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap-int.h | 2 | ||||
| -rw-r--r-- | wsutil/socket.h | 11 | ||||
| -rw-r--r-- | wsutil/tempfile.c | 5 |
13 files changed, 11 insertions, 39 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index bdbd6329b5..4630e6ba39 100644 --- a/ConfigureChecks.cmake +++ b/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 diff --git a/caputils/airpcap.h b/caputils/airpcap.h index dcef9388ea..f11e6a1478 100644 --- a/caputils/airpcap.h +++ b/caputils/airpcap.h @@ -27,7 +27,7 @@ #pragma warning( disable : 4996) #endif -#ifdef HAVE_WINSOCK2_H +#ifdef _WIN32 #include <winsock2.h> #endif diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index fe5491cc08..994411a6a7 100644 --- a/cmakeconfig.h.in +++ b/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 @@ -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" diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 3f3ef5ad31..df7a7ff015 100644 --- a/epan/addr_resolv.c +++ b/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 diff --git a/epan/dissectors/packet-lbm.h b/epan/dissectors/packet-lbm.h index 8772b0509a..4eee77ae21 100644 --- a/epan/dissectors/packet-lbm.h +++ b/epan/dissectors/packet-lbm.h @@ -98,7 +98,7 @@ # include <netinet/in.h> #endif -#ifdef HAVE_WINSOCK2_H +#ifdef _WIN32 #include <winsock2.h> #endif @@ -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 @@ -36,7 +36,7 @@ #include <errno.h> -#ifdef HAVE_WINSOCK2_H +#ifdef _WIN32 # include <winsock2.h> #endif diff --git a/ui/tap-sctp-analysis.h b/ui/tap-sctp-analysis.h index 7e007db4a0..b5d5f1542a 100644 --- a/ui/tap-sctp-analysis.h +++ b/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 @@ -32,7 +32,7 @@ #include <unistd.h> #endif -#ifdef HAVE_WINDOWS_H +#ifdef _WIN32 #include <windows.h> #endif diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h index 6f03457fe5..01d697b7ac 100644 --- a/wiretap/wtap-int.h +++ b/wiretap/wtap-int.h @@ -24,7 +24,7 @@ #include <glib.h> #include <time.h> -#ifdef HAVE_WINSOCK2_H +#ifdef _WIN32 #include <winsock2.h> #endif diff --git a/wsutil/socket.h b/wsutil/socket.h index 372cd2f793..4c5a9fe95c 100644 --- a/wsutil/socket.h +++ b/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 diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c index 8e1f8dc588..62b4219f10 100644 --- a/wsutil/tempfile.c +++ b/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 |