diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-12 01:56:21 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-04-12 11:29:06 +0000 |
| commit | 75d40599b04d69a0857418ac7b7adac1266420dc (patch) | |
| tree | dd0029f7de5796e42614737c7b95bfb9589650ce /epan/proto.h | |
| parent | c6fb9ee21495a06ece8681e81872dd23d0d4be85 (diff) | |
No need to include <epan/packet.h> in <epan/ftypes/ftypes-int.h>.
It's sufficient to include <epan/proto.h>...
...as long as <epan/proto.h> includes <epan/tfs.h>, just as it includes
<epan/value_string.h>.
And, since it's already including <epan/value_string.h>, it doesn't need
to have a definition of struct _value_string as an incomplete type,
given that <epan/value_string.h> gives a definition of it as a complete
type.
Change-Id: Ic296bc0b0d68277ba7e0569412b780fd847ecca2
Reviewed-on: https://code.wireshark.org/review/21033
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/proto.h')
| -rw-r--r-- | epan/proto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/proto.h b/epan/proto.h index 6258958531..3230f7167d 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -46,6 +46,7 @@ #include "time_fmt.h" #include "tvbuff.h" #include "value_string.h" +#include "tfs.h" #include "packet_info.h" #include "ftypes/ftypes.h" #include "register.h" @@ -69,7 +70,6 @@ WS_DLL_PUBLIC int hf_text_only; /** the maximum length of a protocol field string representation */ #define ITEM_LABEL_LENGTH 240 -struct _value_string; struct expert_field; /** Make a const value_string[] look like a _value_string pointer, used to set header_field_info.strings */ |