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/service_response_time_table.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/service_response_time_table.c')
| -rw-r--r-- | ui/gtk/service_response_time_table.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/service_response_time_table.c b/ui/gtk/service_response_time_table.c index f957963a36..fb91afdc10 100644 --- a/ui/gtk/service_response_time_table.c +++ b/ui/gtk/service_response_time_table.c @@ -302,7 +302,7 @@ srt_create_popup_menu(srt_stat_table *rst) action_group = gtk_action_group_new ("ServiceRespTFilterPopupActionGroup"); gtk_action_group_add_actions (action_group, /* the action group */ - (gpointer)service_resp_t__popup_entries, /* an array of action descriptions */ + (GtkActionEntry *)service_resp_t__popup_entries, /* an array of action descriptions */ G_N_ELEMENTS(service_resp_t__popup_entries), /* the number of entries */ rst); /* data to pass to the action callbacks */ @@ -477,7 +477,7 @@ init_srt_table(srt_stat_table *rst, int num_procs, GtkWidget *vbox, const char * gtk_widget_show(rst->scrolled_window); rst->num_procs=num_procs; - rst->procedures=g_malloc(sizeof(srt_procedure_t)*num_procs); + rst->procedures=(srt_procedure_t *)g_malloc(sizeof(srt_procedure_t)*num_procs); for(i=0;i<num_procs;i++){ time_stat_init(&rst->procedures[i].stats); rst->procedures[i].index = 0; @@ -501,7 +501,7 @@ init_srt_table_row(srt_stat_table *rst, int indx, const char *procedure) int i; rst->num_procs=indx+1; - rst->procedures=g_realloc(rst->procedures, sizeof(srt_procedure_t)*(rst->num_procs)); + rst->procedures=(srt_procedure_t *)g_realloc(rst->procedures, sizeof(srt_procedure_t)*(rst->num_procs)); for(i=old_num_procs;i<rst->num_procs;i++){ time_stat_init(&rst->procedures[i].stats); rst->procedures[i].index = i; |