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/smb2_stat.c | |
| parent | 8112ecc321d5d2025e7b780db21f88a31d0ee472 (diff) | |
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/smb2_stat.c')
| -rw-r--r-- | ui/gtk/smb2_stat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c index 12cb854fb2..9d1e6cfa7f 100644 --- a/ui/gtk/smb2_stat.c +++ b/ui/gtk/smb2_stat.c @@ -74,7 +74,7 @@ static int smb2stat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi) { smb2stat_t *ss=(smb2stat_t *)pss; - const smb2_info_t *si=psi; + const smb2_info_t *si=(smb2_info_t *)psi; /* we are only interested in response packets */ if(!(si->flags&SMB2_FLAGS_RESPONSE)){ @@ -132,7 +132,7 @@ gtk_smb2stat_init(const char *opt_arg, void *userdata _U_) filter=NULL; } - ss=g_malloc(sizeof(smb2stat_t)); + ss=(smb2stat_t *)g_malloc(sizeof(smb2stat_t)); ss->win = dlg_window_new("smb2-stat"); /* transient_for top_level */ gtk_window_set_destroy_with_parent (GTK_WINDOW(ss->win), TRUE); @@ -176,7 +176,7 @@ gtk_smb2stat_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); |