summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorRaimo Järvi <raimo.jarvi@gmail.com>2011-01-11 12:46:31 +0000
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2011-01-11 12:47:49 +0000
commit0645c498f0adde39b17b2df55b7a982fff5795fa (patch)
tree2fde52231fd1b70e59111f2674cf7d36a6fcffb2 /gst
parent08a71b98a9302754cf04661d4c676f13a7d4ca0c (diff)
gstpoll: fix compiler warning with MingW
gstpoll.c: In function 'gst_poll_get_read_gpollfd': gstpoll.c:692:10: warning: assignment makes integer from pointer without a cast https://bugzilla.gnome.org/show_bug.cgi?id=638900
Diffstat (limited to 'gst')
-rw-r--r--gst/gstpoll.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/gst/gstpoll.c b/gst/gstpoll.c
index 95be70e041..5e8f6bd004 100644
--- a/gst/gstpoll.c
+++ b/gst/gstpoll.c
@@ -689,7 +689,11 @@ gst_poll_get_read_gpollfd (GstPoll * set, GPollFD * fd)
#ifndef G_OS_WIN32
fd->fd = set->control_read_fd.fd;
#else
- fd->fd = set->wakeup_event;
+#if GLIB_SIZEOF_VOID_P == 8
+ fd->fd = (gint64) set->wakeup_event;
+#else
+ fd->fd = (gint) set->wakeup_event;
+#endif
#endif
fd->events = G_IO_IN | G_IO_HUP | G_IO_ERR;
fd->revents = 0;