diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-17 16:48:47 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-17 16:48:47 +0000 |
| commit | 81e80f2c0b43144a020ded42a2c5b8e9b66c6b2a (patch) | |
| tree | 56e58097dee5ea53c965631cdc442cac735c6735 /epan/dissectors/packet-ieee80211-prism.c | |
| parent | 9a376b8cd0d0302a3ebbc5d5994c6a647dae4887 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48355
Diffstat (limited to 'epan/dissectors/packet-ieee80211-prism.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211-prism.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c index 9cb1a5fccc..6a40026c83 100644 --- a/epan/dissectors/packet-ieee80211-prism.c +++ b/epan/dissectors/packet-ieee80211-prism.c @@ -223,7 +223,7 @@ static gchar * prism_rate_return(guint32 rate) { gchar *result=NULL; - result = ep_alloc(SHORT_STR); + result = (gchar *)ep_alloc(SHORT_STR); result[0] = '\0'; prism_rate_base_custom(result, rate); |