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/mac_lte_stat_dlg.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/mac_lte_stat_dlg.c')
| -rw-r--r-- | ui/gtk/mac_lte_stat_dlg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c index 84ac7e2b6d..47a8bd3819 100644 --- a/ui/gtk/mac_lte_stat_dlg.c +++ b/ui/gtk/mac_lte_stat_dlg.c @@ -273,7 +273,7 @@ static mac_lte_ep_t* alloc_mac_lte_ep(const struct mac_lte_tap_info *si, packet_ return NULL; } - if (!(ep = g_malloc(sizeof(mac_lte_ep_t)))) { + if (!(ep = (mac_lte_ep_t *)g_malloc(sizeof(mac_lte_ep_t)))) { return NULL; } @@ -1044,7 +1044,7 @@ gtk_mac_lte_stat_init(const char *opt_arg, void *userdata _U_) /* Create dialog */ - hs = g_malloc(sizeof(mac_lte_stat_t)); + hs = (mac_lte_stat_t *)g_malloc(sizeof(mac_lte_stat_t)); hs->ep_list = NULL; /* Copy filter (so can be used for window title at reset) */ @@ -1367,10 +1367,10 @@ gtk_mac_lte_stat_init(const char *opt_arg, void *userdata _U_) gtk_box_pack_end (GTK_BOX(top_level_vbox), bbox, FALSE, FALSE, 0); /* Add the close button */ - 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->mac_lte_stat_dlg_w, close_bt, window_cancel_button_cb); - help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); + help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_LTE_MAC_TRAFFIC_DIALOG); /* Set callbacks */ |