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/gui_utils.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/gui_utils.c')
| -rw-r--r-- | ui/gtk/gui_utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c index 7f8357eca2..410ecb680c 100644 --- a/ui/gtk/gui_utils.c +++ b/ui/gtk/gui_utils.c @@ -666,7 +666,7 @@ pipe_input_cb(GIOChannel *source _U_, /* restore pipe handler */ pipe_input->pipe_input_id = g_io_add_watch_full(pipe_input->channel, G_PRIORITY_HIGH, - G_IO_IN|G_IO_ERR|G_IO_HUP, + (GIOCondition)(G_IO_IN|G_IO_ERR|G_IO_HUP), pipe_input_cb, pipe_input, NULL); @@ -701,7 +701,7 @@ pipe_input_set_handler(gint source, g_io_channel_set_encoding(pipe_input.channel, NULL, NULL); pipe_input.pipe_input_id = g_io_add_watch_full(pipe_input.channel, G_PRIORITY_HIGH, - G_IO_IN|G_IO_ERR|G_IO_HUP, + (GIOCondition)(G_IO_IN|G_IO_ERR|G_IO_HUP), pipe_input_cb, &pipe_input, NULL); @@ -1764,7 +1764,7 @@ gdk_pixbuf_get_from_surface(cairo_surface_t *surface, g_return_val_if_fail(surface != NULL, NULL); g_return_val_if_fail(width > 0 && height > 0, NULL); - content = cairo_surface_get_content(surface) | CAIRO_CONTENT_COLOR; + content = (cairo_content_t)(cairo_surface_get_content(surface) | CAIRO_CONTENT_COLOR); dest = gdk_pixbuf_new(GDK_COLORSPACE_RGB, !!(content & CAIRO_CONTENT_ALPHA), 8, |