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/expert_comp_table.c | |
| parent | da1bdffa1bbd6a9574afe2e834e1ac501653f3a4 (diff) | |
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/expert_comp_table.c')
| -rw-r--r-- | ui/gtk/expert_comp_table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/expert_comp_table.c b/ui/gtk/expert_comp_table.c index 945e0e6a35..2c27ff33ab 100644 --- a/ui/gtk/expert_comp_table.c +++ b/ui/gtk/expert_comp_table.c @@ -606,7 +606,7 @@ error_create_popup_menu(error_equiv_table *err) action_group = gtk_action_group_new ("ExpertFilterPopupActionGroup"); gtk_action_group_add_actions (action_group, /* the action group */ - (gpointer)expert_popup_entries, /* an array of action descriptions */ + (GtkActionEntry *)expert_popup_entries, /* an array of action descriptions */ G_N_ELEMENTS(expert_popup_entries), /* the number of entries */ err); /* data to pass to the action callbacks */ |