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 /epan | |
| 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 'epan')
| -rw-r--r-- | epan/addr_resolv.c | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-lbm.h | 2 |
2 files changed, 3 insertions, 6 deletions
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 |