projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
08a71b9
)
gstpoll: fix compiler warning with MingW
author
Raimo Järvi
<raimo.jarvi@gmail.com>
Tue, 11 Jan 2011 12:46:31 +0000
(12:46 +0000)
committer
Tim-Philipp Müller
<tim.muller@collabora.co.uk>
Tue, 11 Jan 2011 12:47:49 +0000
(12:47 +0000)
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
gst/gstpoll.c
patch
|
blob
|
history
diff --git
a/gst/gstpoll.c
b/gst/gstpoll.c
index
95be70e
..
5e8f6bd
100644
(file)
--- 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;