diff options
author | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:58:59 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:58:59 +0000 |
commit | 35d1b406d74101f0ec04026e9a8b2ce75d57201d (patch) | |
tree | 0f082370b8dc5dd91106bda722e9d097a568dbb3 /ui/gtk/conversations_ipx.c | |
parent | 8112ecc321d5d2025e7b780db21f88a31d0ee472 (diff) | |
download | wireshark-35d1b406d74101f0ec04026e9a8b2ce75d57201d.tar.gz |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10408
Note: The following parts of the patch had been previously done:
asn1/snmp/packet-snmp-template.c
epan/dissectors/packet-snmp.c
epan/dissectors/packet-x11.c
svn path=/trunk/; revision=48448
Diffstat (limited to 'ui/gtk/conversations_ipx.c')
-rw-r--r-- | ui/gtk/conversations_ipx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/conversations_ipx.c b/ui/gtk/conversations_ipx.c index f0751feffc..9664f88c48 100644 --- a/ui/gtk/conversations_ipx.c +++ b/ui/gtk/conversations_ipx.c @@ -42,7 +42,7 @@ static int ipx_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) { - const ipxhdr_t *ipxh=vip; + const ipxhdr_t *ipxh=(ipxhdr_t *)vip; add_conversation_table_data((conversations_table *)pct, &ipxh->ipx_src, &ipxh->ipx_dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->fd->rel_ts, SAT_NONE, PT_NONE); |