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/sctp_chunk_stat.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/sctp_chunk_stat.c')
| -rw-r--r-- | ui/gtk/sctp_chunk_stat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/sctp_chunk_stat.c b/ui/gtk/sctp_chunk_stat.c index dac4874f4e..6ba6535b93 100644 --- a/ui/gtk/sctp_chunk_stat.c +++ b/ui/gtk/sctp_chunk_stat.c @@ -115,7 +115,7 @@ static sctp_ep_t* alloc_sctp_ep(struct _sctp_info *si) if(!si) return NULL; - if (!(ep = g_malloc(sizeof(sctp_ep_t)))) + if (!(ep = (sctp_ep_t *)g_malloc(sizeof(sctp_ep_t)))) return NULL; COPY_ADDRESS(&ep->src,&si->ip_src); @@ -266,7 +266,7 @@ sctpstat_init(const char *opt_arg, void *userdata _U_) GtkWidget *bbox; GtkWidget *close_bt; - hs=g_malloc(sizeof(sctpstat_t)); + hs=(sctpstat_t *)g_malloc(sizeof(sctpstat_t)); if(strncmp(opt_arg,"sctp,stat,",10) == 0){ hs->filter=g_strdup(opt_arg+10); } else { @@ -306,7 +306,7 @@ sctpstat_init(const char *opt_arg, void *userdata _U_) bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL); gtk_box_pack_end(GTK_BOX(hs->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(hs->win, close_bt, window_cancel_button_cb); g_signal_connect(hs->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); |