From 77686a65a3913840c734b581783e0ca80fcf571e Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 9 Oct 2015 11:45:35 -0700 Subject: Get rid of a void * in frame_data. Forward-declare struct _color_filter and use it in struct _frame_data. Change-Id: I4543206bc71ad1e088b60347e6deb6d87a573b35 Reviewed-on: https://code.wireshark.org/review/10914 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/frame_data.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epan/frame_data.h b/epan/frame_data.h index 2980b04ca9..b47093e3de 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -61,6 +61,7 @@ typedef enum { /** The frame number is the ordinal number of the frame in the capture, so it's 1-origin. In various contexts, 0 as a frame number means "frame number unknown". */ +struct _color_filter; /* Forward */ DIAG_OFF(pedantic) typedef struct _frame_data { GSList *pfd; /**< Per frame proto data */ @@ -85,7 +86,7 @@ typedef struct _frame_data { } flags; gint16 tsprec; /**< Time stamp precision */ - const void *color_filter; /**< Per-packet matching color_filter_t object */ + const struct _color_filter *color_filter; /**< Per-packet matching color_filter_t object */ nstime_t abs_ts; /**< Absolute timestamp */ nstime_t shift_offset; /**< How much the abs_tm of the frame is shifted */ -- cgit v1.2.3