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-ncp-nmas.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-ncp-nmas.c')
-rw-r--r-- | epan/dissectors/packet-ncp-nmas.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c index f3a65f3d36..e7e40c7a0e 100644 --- a/epan/dissectors/packet-ncp-nmas.c +++ b/epan/dissectors/packet-ncp-nmas.c @@ -204,7 +204,7 @@ nmas_string(tvbuff_t* tvb, int hfinfo, proto_tree *nmas_tree, int offset, gboole guint16 c_char; guint32 length_remaining = 0; - buffer=ep_alloc(ITEM_LABEL_LENGTH+1); + buffer=(char *)ep_alloc(ITEM_LABEL_LENGTH+1); if (little) { str_length = tvb_get_letohl(tvb, foffset); } |