aboutsummaryrefslogtreecommitdiffstats
path: root/epan/conversation_table.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-01-24 17:10:20 -0800
committerGuy Harris <guy@alum.mit.edu>2016-01-25 02:24:34 +0000
commit099698445b5cd60b00777ae47f68fba620fa975e (patch)
tree8c37921e0fa9893dd0c00e3b66f287c4d7d1a78d /epan/conversation_table.c
parent6beb19af8e86c17d9b2d69bf1cc0b2e24fbc111b (diff)
Move the proto data stuff out of frame_data.[ch].
It's not tied to the frame_data structure any more, so it belongs by itself. Clean up some #includes while we're at it; in particular, frame_data.h doesn't use anything related to tvbuffs, so don't have it gratuitiously include tvbuff.h. Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c Reviewed-on: https://code.wireshark.org/review/13518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/conversation_table.c')
-rw-r--r--epan/conversation_table.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/conversation_table.c b/epan/conversation_table.c
index a7e7cb1943..1aaeabc4b3 100644
--- a/epan/conversation_table.c
+++ b/epan/conversation_table.c
@@ -25,8 +25,8 @@
#include <string.h>
-#include "packet_info.h"
#include "proto.h"
+#include "packet_info.h"
#include "conversation_table.h"
#include "addr_resolv.h"