diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-05 16:24:52 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-06 00:25:19 +0000 |
| commit | 71c603b2fc8c62651485b550494ee30da6c75cb5 (patch) | |
| tree | 0a712feaff2ecc7c1b0ab813ddbfe0a5837a2a6c | |
| parent | 7604371a261857b40a136bef32dc9f47ef27022c (diff) | |
Clean up more includes of wtap.h.
Change-Id: Ie53b64f7e5b39a50dffb62fc0b886da71e0a3bd2
Reviewed-on: https://code.wireshark.org/review/13066
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | capinfos.c | 3 | ||||
| -rw-r--r-- | captype.c | 3 | ||||
| -rw-r--r-- | caputils/airpcap_loader.c | 4 | ||||
| -rw-r--r-- | editcap.c | 2 | ||||
| -rw-r--r-- | mergecap.c | 3 | ||||
| -rw-r--r-- | reordercap.c | 2 | ||||
| -rw-r--r-- | ui/qt/compiled_filter_output.cpp | 5 | ||||
| -rw-r--r-- | ui/text_import.h | 3 |
8 files changed, 15 insertions, 10 deletions
diff --git a/capinfos.c b/capinfos.c index 5e5c9530dd..5a3e2b3f56 100644 --- a/capinfos.c +++ b/capinfos.c @@ -73,6 +73,8 @@ #include <zlib.h> /* to get the libz version number */ #endif +#include <wiretap/wtap.h> + #include <wsutil/crash_info.h> #include <wsutil/filesystem.h> #include <wsutil/privileges.h> @@ -83,7 +85,6 @@ #include <wsutil/plugins.h> #endif -#include "wtap.h" #include <wsutil/report_err.h> #include <wsutil/str_util.h> #include <wsutil/file_util.h> @@ -42,6 +42,8 @@ #include <glib.h> +#include <wiretap/wtap.h> + #include <wsutil/crash_info.h> #include <wsutil/file_util.h> #include <wsutil/filesystem.h> @@ -53,7 +55,6 @@ #include <wsutil/plugins.h> #endif -#include "wtap.h" #include <wsutil/report_err.h> #include <wsutil/str_util.h> diff --git a/caputils/airpcap_loader.c b/caputils/airpcap_loader.c index 98e4699b83..0c77b626c3 100644 --- a/caputils/airpcap_loader.c +++ b/caputils/airpcap_loader.c @@ -28,9 +28,9 @@ #include <glib.h> #include <gmodule.h> - -#include <wtap.h> #include <pcap.h> + +#include <wiretap/wtap.h> #endif #include <epan/crypt/airpdcap_ws.h> @@ -58,7 +58,7 @@ #include <zlib.h> /* to get the libz version number */ #endif -#include "wtap.h" +#include <wiretap/wtap.h> #ifndef HAVE_GETOPT_LONG #include "wsutil/wsgetopt.h" diff --git a/mergecap.c b/mergecap.c index ef167d0587..5c27447c0c 100644 --- a/mergecap.c +++ b/mergecap.c @@ -39,7 +39,8 @@ #endif #include <string.h> -#include "wtap.h" + +#include <wiretap/wtap.h> #ifndef HAVE_GETOPT_LONG #include <wsutil/wsgetopt.h> diff --git a/reordercap.c b/reordercap.c index 76bd66d68a..b96b214b1a 100644 --- a/reordercap.c +++ b/reordercap.c @@ -36,7 +36,7 @@ #include <zlib.h> /* to get the libz version number */ #endif -#include "wtap.h" +#include <wiretap/wtap.h> #ifndef HAVE_GETOPT_LONG #include "wsutil/wsgetopt.h" diff --git a/ui/qt/compiled_filter_output.cpp b/ui/qt/compiled_filter_output.cpp index 00c5179cb1..7ccdb86988 100644 --- a/ui/qt/compiled_filter_output.cpp +++ b/ui/qt/compiled_filter_output.cpp @@ -23,9 +23,10 @@ #include <ui_compiled_filter_output.h> #include "compiled_filter_output.h" -#include "capture_opts.h" -#include "wtap.h" #include <pcap.h> + +#include "capture_opts.h" +#include <wiretap/wtap.h> #include "ui/capture_globals.h" #include "wireshark_application.h" diff --git a/ui/text_import.h b/ui/text_import.h index 9a92576f8e..2fb8b608d9 100644 --- a/ui/text_import.h +++ b/ui/text_import.h @@ -30,7 +30,8 @@ #define __TEXT_IMPORT_H__ #include <glib.h> -#include "wtap.h" + +#include <wiretap/wtap.h> #ifdef __cplusplus extern "C" { |