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/ansi_map_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/ansi_map_stat.c')
| -rw-r--r-- | ui/gtk/ansi_map_stat.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/gtk/ansi_map_stat.c b/ui/gtk/ansi_map_stat.c index c1f9d0cdb8..9cc7d57add 100644 --- a/ui/gtk/ansi_map_stat.c +++ b/ui/gtk/ansi_map_stat.c @@ -200,7 +200,7 @@ static void ansi_map_stat_reset( void *tapdata) { - ansi_map_stat_t *stat_p = tapdata; + ansi_map_stat_t *stat_p = (ansi_map_stat_t *)tapdata; memset(stat_p, 0, sizeof(ansi_map_stat_t)); } @@ -213,8 +213,8 @@ ansi_map_stat_packet( epan_dissect_t *edt _U_, const void *data) { - ansi_map_stat_t *stat_p = tapdata; - const ansi_map_tap_rec_t *data_p = data; + ansi_map_stat_t *stat_p = (ansi_map_stat_t *)tapdata; + const ansi_map_tap_rec_t *data_p = (const ansi_map_tap_rec_t *)data; #if 0 /* always false because message_type is 8 bit value */ if (data_p->message_type >= ANSI_MAP_MAX_NUM_MESSAGE_TYPES) @@ -237,7 +237,7 @@ static void ansi_map_stat_draw( void *tapdata) { - ansi_map_stat_t *stat_p = tapdata; + ansi_map_stat_t *stat_p = (ansi_map_stat_t *)tapdata; int i; float avg; GtkListStore *list_store; @@ -313,7 +313,7 @@ ansi_map_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); |