diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-01-05 14:20:57 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-01-05 22:21:24 +0000 |
commit | fb68d242bb2d34e4c43a28c979de559b98ca7643 (patch) | |
tree | 8153bcb563d4178b05996af87973c4e901916e61 /caputils | |
parent | 5815d1080ad7b934f120a54e7c8f85c3617f539c (diff) |
For non-libwiretap code, use <wiretap/XXX.h> to include libwiretap headers.
That makes it clearer that they're libwiretap headers.
Change-Id: Ia78a3496913b901073ee59e62bfb72c1677450fa
Reviewed-on: https://code.wireshark.org/review/13064
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'caputils')
-rw-r--r-- | caputils/capture-pcap-util.c | 6 | ||||
-rw-r--r-- | caputils/capture_win_ifnames.c | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/caputils/capture-pcap-util.c b/caputils/capture-pcap-util.c index 62a75b7599..3f382fa3a3 100644 --- a/caputils/capture-pcap-util.c +++ b/caputils/capture-pcap-util.c @@ -39,14 +39,14 @@ #include <sys/socket.h> #endif -#include <wtap.h> -#include <libpcap.h> +#include <wiretap/wtap.h> +#include <wiretap/libpcap.h> #include "caputils/capture_ifinfo.h" #include "caputils/capture-pcap-util.h" #include "caputils/capture-pcap-util-int.h" -#include "wsutil/file_util.h" +#include <wsutil/file_util.h> #ifndef _WIN32 #include <netinet/in.h> diff --git a/caputils/capture_win_ifnames.c b/caputils/capture_win_ifnames.c index f0222562ab..e85b3dbad9 100644 --- a/caputils/capture_win_ifnames.c +++ b/caputils/capture_win_ifnames.c @@ -31,10 +31,11 @@ #include <stdio.h> #include <stdlib.h> -#include <wtap.h> -#include <libpcap.h> #include <glib.h> +#include <wiretap/wtap.h> +#include <wiretap/libpcap.h> + #include <ntddndis.h> #ifndef NDIS_IF_MAX_STRING_SIZE @@ -49,7 +50,8 @@ #include "caputils/capture_ifinfo.h" #include "caputils/capture_win_ifnames.h" -#include "wsutil/file_util.h" + +#include <wsutil/file_util.h> static int gethexdigit(const char *p) { |