From adf6b1a8df28d7c419dc660e7fc3c8b43164ff8e Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 23 Jun 2014 17:27:28 -0700 Subject: [PATCH] For capchild headers, include . Change-Id: I780c69ee637dcd9846756a2e2d6a35baf02d826d Reviewed-on: https://code.wireshark.org/review/2594 Reviewed-by: Guy Harris --- capchild/capture_ifinfo.c | 4 ++-- capchild/capture_sync.c | 2 +- capture-pcap-util-unix.c | 2 +- capture-pcap-util.c | 2 +- capture-wpcap.c | 2 +- capture.c | 4 ++-- capture_opts.c | 2 +- capture_ui_utils.c | 2 +- capture_win_ifnames.c | 2 +- dumpcap.c | 4 ++-- echld/echld-int.h | 4 ++-- tshark.c | 4 ++-- ui/gtk/capture_if_dlg.h | 2 +- ui/gtk/main.c | 4 ++-- ui/gtk/prefs_capture.c | 2 +- ui/qt/main.cpp | 4 ++-- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/capchild/capture_ifinfo.c b/capchild/capture_ifinfo.c index 039ef53473..8f8c985d88 100644 --- a/capchild/capture_ifinfo.c +++ b/capchild/capture_ifinfo.c @@ -48,10 +48,10 @@ #include "capture_opts.h" #include "capture_session.h" -#include "capture_sync.h" +#include #include "log.h" -#include "capture_ifinfo.h" +#include #ifdef HAVE_PCAP_REMOTE static GList *remote_interface_list = NULL; diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c index 2f9d2cc62e..bc5f6c4907 100644 --- a/capchild/capture_sync.c +++ b/capchild/capture_sync.c @@ -85,7 +85,7 @@ #include "file.h" #include "capture.h" -#include "capture_sync.h" +#include #include "sync_pipe.h" diff --git a/capture-pcap-util-unix.c b/capture-pcap-util-unix.c index 20d728b7ed..f169d701e3 100644 --- a/capture-pcap-util-unix.c +++ b/capture-pcap-util-unix.c @@ -64,7 +64,7 @@ struct rtentry; #endif /* HAVE_PCAP_FINDALLDEVS */ -#include "capture_ifinfo.h" +#include #include "capture-pcap-util.h" #include "capture-pcap-util-int.h" diff --git a/capture-pcap-util.c b/capture-pcap-util.c index f8b12d2d65..7f9a5d2d1a 100644 --- a/capture-pcap-util.c +++ b/capture-pcap-util.c @@ -42,7 +42,7 @@ #include #include -#include "capture_ifinfo.h" +#include #include "capture-pcap-util.h" #include "capture-pcap-util-int.h" diff --git a/capture-wpcap.c b/capture-wpcap.c index a1dbc8f1b5..c7a172623a 100644 --- a/capture-wpcap.c +++ b/capture-wpcap.c @@ -30,7 +30,7 @@ #include -#include "capture_ifinfo.h" +#include #include "capture-pcap-util.h" #include "capture-pcap-util-int.h" #include "capture-wpcap.h" diff --git a/capture.c b/capture.c index c359e52536..ada780b177 100644 --- a/capture.c +++ b/capture.c @@ -38,8 +38,8 @@ #include #include "file.h" #include "capture.h" -#include "capture_ifinfo.h" -#include "capture_sync.h" +#include +#include #include "capture_info.h" #include "capture_ui_utils.h" #include "ui/util.h" diff --git a/capture_opts.c b/capture_opts.c index 37471b623c..6b17189e05 100644 --- a/capture_opts.c +++ b/capture_opts.c @@ -45,7 +45,7 @@ #include "clopts_common.h" #include "cmdarg_err.h" -#include "capture_ifinfo.h" +#include #include "capture-pcap-util.h" #include diff --git a/capture_ui_utils.c b/capture_ui_utils.c index ccd94b3549..56e46aef6b 100644 --- a/capture_ui_utils.c +++ b/capture_ui_utils.c @@ -32,7 +32,7 @@ #include "epan/prefs.h" #include "epan/ex-opt.h" -#include "capture_ifinfo.h" +#include #include "capture_ui_utils.h" #include "wiretap/wtap.h" #include "epan/to_str.h" diff --git a/capture_win_ifnames.c b/capture_win_ifnames.c index 03cad32c03..ee1c3d12e8 100644 --- a/capture_win_ifnames.c +++ b/capture_win_ifnames.c @@ -47,7 +47,7 @@ #include "log.h" -#include "capture_ifinfo.h" +#include #include "capture_win_ifnames.h" #include "wsutil/file_util.h" diff --git a/dumpcap.c b/dumpcap.c index 1e21f56454..90b12b1079 100644 --- a/dumpcap.c +++ b/dumpcap.c @@ -119,8 +119,8 @@ #include "capture_opts.h" #include "capture_session.h" -#include "capture_ifinfo.h" -#include "capture_sync.h" +#include +#include #include "conditions.h" #include "capture_stop_conditions.h" diff --git a/echld/echld-int.h b/echld/echld-int.h index 29c737bbd9..aaaca979b2 100644 --- a/echld/echld-int.h +++ b/echld/echld-int.h @@ -62,8 +62,8 @@ #include "capture_opts.h" #include "capture_session.h" -#include "capture_ifinfo.h" -#include "capture_sync.h" +#include +#include #include "version_info.h" #include "cfile.h" #include "wsutil/crash_info.h" diff --git a/tshark.c b/tshark.c index e4c9a98a65..7360652961 100644 --- a/tshark.c +++ b/tshark.c @@ -102,14 +102,14 @@ #ifdef HAVE_LIBPCAP #include "capture_ui_utils.h" -#include "capture_ifinfo.h" +#include #include "capture-pcap-util.h" #ifdef _WIN32 #include "capture-wpcap.h" #include #endif /* _WIN32 */ #include "capture_session.h" -#include "capture_sync.h" +#include #include "capture_opts.h" #endif /* HAVE_LIBPCAP */ #include "log.h" diff --git a/ui/gtk/capture_if_dlg.h b/ui/gtk/capture_if_dlg.h index 3557a58bb0..aeecdcac3d 100644 --- a/ui/gtk/capture_if_dlg.h +++ b/ui/gtk/capture_if_dlg.h @@ -44,7 +44,7 @@ capture_if_cb(GtkWidget *widget, gpointer data); #ifdef HAVE_LIBPCAP -#include "capture_ifinfo.h" /* for if_info_t */ +#include /* for if_info_t */ /* * Used to retrieve the interface icon diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 5848ea15ef..14def156ba 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -132,9 +132,9 @@ #ifdef HAVE_LIBPCAP #include "capture_ui_utils.h" #include "capture-pcap-util.h" -#include "capture_ifinfo.h" +#include #include "capture.h" -#include "capture_sync.h" +#include #endif #ifdef _WIN32 diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c index cb092ee9a2..703afd9c98 100644 --- a/ui/gtk/prefs_capture.c +++ b/ui/gtk/prefs_capture.c @@ -30,7 +30,7 @@ #include #include "capture_opts.h" -#include "capture_ifinfo.h" +#include #include "capture_ui_utils.h" #include "ui/capture_globals.h" #include "ui/iface_lists.h" diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 91eb05f9a8..d14e6226f7 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -105,9 +105,9 @@ #ifdef HAVE_LIBPCAP # include "capture_ui_utils.h" # include "capture-pcap-util.h" -# include "capture_ifinfo.h" +# include # include "capture.h" -# include "capture_sync.h" +# include #endif #ifdef _WIN32