diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 13:00:07 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 13:00:07 +0100 |
| commit | 148bf27ce36a2abf88f431bf83214779db771a64 (patch) | |
| tree | 5d4162cf1377fbc230128dfd3fe4ef0c504c8855 /gst/gstpoll.c | |
| parent | 7cef56076e828fa0d7f9568ddf5f5eb115f3a82a (diff) | |
| parent | bea0ed2fc1da66f97b38397188e7ffb3a8619e61 (diff) | |
Merge branch 'master' into 0.11
Diffstat (limited to 'gst/gstpoll.c')
| -rw-r--r-- | gst/gstpoll.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gst/gstpoll.c b/gst/gstpoll.c index fed594fc5..3125681d4 100644 --- a/gst/gstpoll.c +++ b/gst/gstpoll.c @@ -75,7 +75,12 @@ #define EINPROGRESS WSAEINPROGRESS #else #define _GNU_SOURCE 1 +#ifdef HAVE_SYS_POLL_H #include <sys/poll.h> +#endif +#ifdef HAVE_POLL_H +#include <poll.h> +#endif #include <sys/time.h> #include <sys/socket.h> #endif |