path: root/capchild
diff options
authorGuy Harris <guy@alum.mit.edu>2017-12-08 00:30:55 -0800
committerGuy Harris <guy@alum.mit.edu>2017-12-08 08:31:41 +0000
commit8aa14236f8b0ea69901ea9ed87ebabd0d278e973 (patch)
treeb49b5d6b0ee5d647cf33054c5f280d2dc4fa4f99 /capchild
parentf29b3deb6d867b16fb8bc4bd5f66a5b6326a6727 (diff)
Have the frame_tvbuff.c routines not use the global cfile.
Have the routines that create them take a pointer to a struct packet_provider_data, store that in the tvbuff data, and use it to get the wtap from which packets are being read. While we're at it, don't include globals.h in any header files, and include it in source files iff the source file actually uses cfile. Add whatever includes that requires. Change-Id: I9f1ee391f951dc427ff62c80f67aa4877a37c229 Reviewed-on: https://code.wireshark.org/review/24733 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'capchild')
1 files changed, 0 insertions, 1 deletions
diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
index 723449f701..e8d6fcf10b 100644
--- a/capchild/capture_sync.c
+++ b/capchild/capture_sync.c
@@ -75,7 +75,6 @@
#include <epan/packet.h>
#include <epan/prefs.h>
-#include "globals.h"
#include "file.h"
#include "ui/capture.h"