From 7fee50274f36a5feba113aa9ad3e72ca37bf1466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Wed, 24 Mar 2021 22:09:19 +0000 Subject: Merge the caputils/ and capchild/ directories The distinction between the different kinds of capture utility may not warrant a special subfolfer for each, and sometimes the distinction is not be clear or some functions could stradle multiple "categories" (like capture_ifinfo.[ch]). Simplify by having only a generic 'capture' subfolder. The separate CMake libraries are kept as a way to reuse object code efficiently. --- dumpcap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'dumpcap.c') diff --git a/dumpcap.c b/dumpcap.c index e7e976b77d..84c2889788 100644 --- a/dumpcap.c +++ b/dumpcap.c @@ -55,11 +55,11 @@ #include "ringbuffer.h" -#include "caputils/capture_ifinfo.h" -#include "caputils/capture-pcap-util.h" -#include "caputils/capture-pcap-util-int.h" +#include "capture/capture_ifinfo.h" +#include "capture/capture-pcap-util.h" +#include "capture/capture-pcap-util-int.h" #ifdef _WIN32 -#include "caputils/capture-wpcap.h" +#include "capture/capture-wpcap.h" #endif /* _WIN32 */ #include "writecap/pcapio.h" @@ -74,8 +74,8 @@ #include "sync_pipe.h" #include "capture_opts.h" -#include -#include +#include +#include #include "wsutil/tempfile.h" #include "log.h" @@ -88,7 +88,7 @@ #include "wsutil/please_report_bug.h" #include "wsutil/glib-compat.h" -#include "caputils/ws80211_utils.h" +#include "capture/ws80211_utils.h" #include "extcap.h" -- cgit v1.2.3