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/afp_stat.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/afp_stat.c')
| -rw-r--r-- | ui/gtk/afp_stat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c index e38063ee4b..7b4ce9d8d8 100644 --- a/ui/gtk/afp_stat.c +++ b/ui/gtk/afp_stat.c @@ -74,7 +74,7 @@ static int afpstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv) { afpstat_t *ss=(afpstat_t *)pss; - const afp_request_val *request_val=prv; + const afp_request_val *request_val=(const afp_request_val *)prv; /* if we havnt seen the request, just ignore it */ if(!request_val){ @@ -128,7 +128,7 @@ gtk_afpstat_init(const char *opt_arg, void *userdata _U_) filter=NULL; } - ss=g_malloc(sizeof(afpstat_t)); + ss=(afpstat_t *)g_malloc(sizeof(afpstat_t)); ss->win=dlg_window_new("afp-stat"); /* transient_for top_level */ gtk_window_set_destroy_with_parent (GTK_WINDOW(ss->win), TRUE); @@ -172,7 +172,7 @@ gtk_afpstat_init(const char *opt_arg, void *userdata _U_) bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL); gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); - close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); + close_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(ss->win, close_bt, window_cancel_button_cb); g_signal_connect(ss->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); |