diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2021-03-24 22:09:19 +0000 |
|---|---|---|
| committer | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2021-03-29 06:08:02 +0100 |
| commit | 7fee50274f36a5feba113aa9ad3e72ca37bf1466 (patch) | |
| tree | 485b040aa4b6f00d9043c379db8fecdea4661f1b /tshark.c | |
| parent | 2ba52cdc0e4216dafdfc32498fc0210c99449ec9 (diff) | |
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.
Diffstat (limited to 'tshark.c')
| -rw-r--r-- | tshark.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -101,15 +101,15 @@ #include "capture_opts.h" -#include "caputils/capture-pcap-util.h" +#include "capture/capture-pcap-util.h" #ifdef HAVE_LIBPCAP -#include "caputils/capture_ifinfo.h" +#include "capture/capture_ifinfo.h" #ifdef _WIN32 -#include "caputils/capture-wpcap.h" +#include "capture/capture-wpcap.h" #endif /* _WIN32 */ -#include <capchild/capture_session.h> -#include <capchild/capture_sync.h> +#include <capture/capture_session.h> +#include <capture/capture_sync.h> #include <ui/capture_info.h> #endif /* HAVE_LIBPCAP */ #include "log.h" |