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/mtp3_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/mtp3_stat.c')
| -rw-r--r-- | ui/gtk/mtp3_stat.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c index 6537db3097..d826e6b300 100644 --- a/ui/gtk/mtp3_stat.c +++ b/ui/gtk/mtp3_stat.c @@ -213,7 +213,7 @@ static void mtp3_stat_reset( void *tapdata) { - mtp3_stat_t (*stat_p)[MTP3_MAX_NUM_OPC_DPC] = tapdata; + mtp3_stat_t (*stat_p)[MTP3_MAX_NUM_OPC_DPC] = (mtp3_stat_t(*)[MTP3_MAX_NUM_OPC_DPC])tapdata; mtp3_num_used = 0; memset(stat_p, 0, MTP3_MAX_NUM_OPC_DPC * sizeof(mtp3_stat_t)); @@ -232,8 +232,8 @@ mtp3_stat_packet( epan_dissect_t *edt _U_, const void *data) { - mtp3_stat_t (*stat_p)[MTP3_MAX_NUM_OPC_DPC] = tapdata; - const mtp3_tap_rec_t *data_p = data; + mtp3_stat_t (*stat_p)[MTP3_MAX_NUM_OPC_DPC] = (mtp3_stat_t(*)[MTP3_MAX_NUM_OPC_DPC])tapdata; + const mtp3_tap_rec_t *data_p = (mtp3_tap_rec_t *)data; int i; if (data_p->si_code >= MTP3_NUM_SI_CODE) @@ -288,7 +288,7 @@ static void mtp3_stat_draw( void *tapdata) { - mtp3_stat_t (*stat_p)[MTP3_MAX_NUM_OPC_DPC] = tapdata; + mtp3_stat_t (*stat_p)[MTP3_MAX_NUM_OPC_DPC] = (mtp3_stat_t(*)[MTP3_MAX_NUM_OPC_DPC])tapdata; int i,j; char *str; float avg; @@ -300,7 +300,7 @@ mtp3_stat_draw( return; } - str=ep_alloc(256); + str=(char *)ep_alloc(256); i = 0; list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW (dlg.table))); /* Get store */ @@ -382,7 +382,7 @@ mtp3_stat_gtk_win_create( bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL); gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); - bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); + bt_close = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(dlg_p->win, bt_close, window_cancel_button_cb); g_signal_connect(dlg_p->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); |