diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-10-25 17:42:15 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-10-26 07:08:41 +0000 |
| commit | bfad9c56f9e65eafba00f97e5e649842782eb2e1 (patch) | |
| tree | 7e2596f74d4be0f001afefebbfcf8d6e0c4bfd9a /wsutil | |
| parent | 859405fd2dd7b76e00d650e1674db2378e05beff (diff) | |
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>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/socket.h | 11 | ||||
| -rw-r--r-- | wsutil/tempfile.c | 5 |
2 files changed, 3 insertions, 13 deletions
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 |