Clean up more includes of wtap.h.
authorGuy Harris <guy@alum.mit.edu>
Wed, 6 Jan 2016 00:24:52 +0000 (16:24 -0800)
committerGuy Harris <guy@alum.mit.edu>
Wed, 6 Jan 2016 00:25:19 +0000 (00:25 +0000)
Change-Id: Ie53b64f7e5b39a50dffb62fc0b886da71e0a3bd2
Reviewed-on: https://code.wireshark.org/review/13066
Reviewed-by: Guy Harris <guy@alum.mit.edu>
capinfos.c
captype.c
caputils/airpcap_loader.c
editcap.c
mergecap.c
reordercap.c
ui/qt/compiled_filter_output.cpp
ui/text_import.h

index 5e5c9530dd32d74dd65d803b0773811497ef2e34..5a3e2b3f5626ab82d70db148369578eb03db4284 100644 (file)
@@ -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>
index 13b5673f9c0d97d4839c03c56a4f732a04802b6f..02094b46154a7839b994580961386734f641eb56 100644 (file)
--- a/captype.c
+++ b/captype.c
@@ -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>
 
index 98e4699b836f4d52342d79711460a82df9c8b7cb..0c77b626c3389d4810a13ffbadbb27db590a6465 100644 (file)
@@ -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>
index fc38be24f6f48ff077035bee43bd7e2f1c98f91c..7e3d3e31371317fd341991d40dcae0d84dc416e3 100644 (file)
--- a/editcap.c
+++ b/editcap.c
@@ -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"
index ef167d05874cf2cc52d4d7b70206beb9f549e09d..5c27447c0cf6b1ebb30f72b03acf9abb3e261bea 100644 (file)
@@ -39,7 +39,8 @@
 #endif
 
 #include <string.h>
-#include "wtap.h"
+
+#include <wiretap/wtap.h>
 
 #ifndef HAVE_GETOPT_LONG
 #include <wsutil/wsgetopt.h>
index 76bd66d68adae161163c43ccd1581f536dcd673c..b96b214b1a87e377e6eff5f87002de06de91b5c4 100644 (file)
@@ -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"
index 00c5179cb137306cde6f0104063cb8eb70bef32c..7ccdb869883cf3e8c4751752f348e0f173263b70 100644 (file)
 #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"
index 9a92576f8e319eadab829b20418a9d01108ef593..2fb8b608d91899b62319adc646e6fec936c239d8 100644 (file)
@@ -30,7 +30,8 @@
 #define __TEXT_IMPORT_H__
 
 #include <glib.h>
-#include "wtap.h"
+
+#include <wiretap/wtap.h>
 
 #ifdef __cplusplus
 extern "C" {