diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:28:57 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:28:57 +0000 |
commit | 3eb06be97d520daef0bad19bf9c261b01abdc66d (patch) | |
tree | 521ce26d4bc68c8e4158df7aa2af769ba60e93b9 /epan/dissectors/packet-netanalyzer.c | |
parent | 089dfcd1085ac242322b8e90845ad9913ac7fcd3 (diff) |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48425
Diffstat (limited to 'epan/dissectors/packet-netanalyzer.c')
-rw-r--r-- | epan/dissectors/packet-netanalyzer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c index 544230a8aa..4c5f888c92 100644 --- a/epan/dissectors/packet-netanalyzer.c +++ b/epan/dissectors/packet-netanalyzer.c @@ -267,7 +267,7 @@ dissect_netanalyzer_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (tvb_get_guint8(tvb, INFO_TYPE_OFFSET) == 0x00) ) { #define MAX_BUFFER 255 - szTemp=ep_alloc(MAX_BUFFER); + szTemp=(guchar *)ep_alloc(MAX_BUFFER); /* everything ok */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "netANALYZER"); |