diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-01-13 01:40:35 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-01-13 09:41:04 +0000 |
commit | 4f4769adf626ec2601e3488efbc2e2d57d55762c (patch) | |
tree | 2677012eab62606f69d519ecbe95bd997013abf1 /wiretap | |
parent | 5892686a9b50f78c05c3b31497a44122489c6886 (diff) |
Move structure definition outside another structure definition.
I guess the ability to define a structure inside another structure is a
C-ism discarded by C++, so it causes warnings if you disallow stuff that
can't be handled by a C++ compiler, as we do.
Change-Id: I8cf52af0424708eb663ab6dbfecbf317fe3bccdb
Reviewed-on: https://code.wireshark.org/review/13257
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
-rw-r--r-- | wiretap/wtap.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/wiretap/wtap.h b/wiretap/wtap.h index c34547d491..5c7b7afa52 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -933,15 +933,17 @@ struct erf_ehdr { #define MAX_ERF_EHDR 8 +struct wtap_erf_eth_hdr { + guint8 offset; + guint8 pad; +}; + struct erf_mc_phdr { struct erf_phdr phdr; struct erf_ehdr ehdr_list[MAX_ERF_EHDR]; union { - struct wtap_erf_eth_hdr { - guint8 offset; - guint8 pad; - } eth_hdr; + struct wtap_erf_eth_hdr eth_hdr; guint32 mc_hdr; guint32 aal2_hdr; } subhdr; |