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/camel_srt.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/camel_srt.c')
| -rw-r--r-- | ui/gtk/camel_srt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/camel_srt.c b/ui/gtk/camel_srt.c index 639dbb0847..5e2709654e 100644 --- a/ui/gtk/camel_srt.c +++ b/ui/gtk/camel_srt.c @@ -95,7 +95,7 @@ static int camelsrt_packet(void *phs, const void *phi) { struct camelsrt_t *hs=(struct camelsrt_t *)phs; - const struct camelsrt_info_t * pi=phi; + const struct camelsrt_info_t * pi=(struct camelsrt_info_t *)phi; int i; for (i=1; i<NB_CAMELSRT_CATEGORY; i++) { @@ -152,7 +152,7 @@ static void gtk_camelsrt_init(const char *opt_arg, void *userdata _U_) filter=NULL; } - p_camelsrt=g_malloc(sizeof(struct camelsrt_t)); + p_camelsrt=(struct camelsrt_t *)g_malloc(sizeof(struct camelsrt_t)); p_camelsrt->win= dlg_window_new("camel-srt"); /* transient_for top_level */ gtk_window_set_destroy_with_parent (GTK_WINDOW(p_camelsrt->win), TRUE); @@ -207,7 +207,7 @@ static void gtk_camelsrt_init(const char *opt_arg, void *userdata _U_) bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL); gtk_box_pack_end(GTK_BOX(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(p_camelsrt->win, close_bt, window_cancel_button_cb); g_signal_connect(p_camelsrt->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); |