diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:29:09 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:29:09 +0000 |
| commit | 8112ecc321d5d2025e7b780db21f88a31d0ee472 (patch) | |
| tree | 885dc3989020530f2fcf4b82ec39284d36d43bd4 /ui/gtk/hostlist_table.h | |
| parent | da1bdffa1bbd6a9574afe2e834e1ac501653f3a4 (diff) | |
| download | wireshark-8112ecc321d5d2025e7b780db21f88a31d0ee472.tar.gz | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10404
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
Also; hostlist_table.c: code under '#ifdef HAVE_GEOIP'
didn't compile and needed a few additional patches.
svn path=/trunk/; revision=48447
Diffstat (limited to 'ui/gtk/hostlist_table.h')
| -rw-r--r-- | ui/gtk/hostlist_table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/hostlist_table.h b/ui/gtk/hostlist_table.h index 3893d728c0..08f1017261 100644 --- a/ui/gtk/hostlist_table.h +++ b/ui/gtk/hostlist_table.h @@ -34,7 +34,7 @@ /** Hostlist information */ typedef struct _hostlist_talker_t { - address address; /**< address */ + address myaddress; /**< address */ SAT_E sat; /**< address type */ guint32 port_type; /**< port_type (e.g. PT_TCP) */ guint32 port; /**< port */ |