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 /ui | |
| 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 'ui')
| -rw-r--r-- | ui/tap-sctp-analysis.h | 2 | ||||
| -rw-r--r-- | ui/util.c | 2 |
2 files changed, 1 insertions, 3 deletions
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 |