Commit da496642 authored by Martin Storsjö's avatar Martin Storsjö

Updated patches to apply cleanly on the latest master

parent fa11c4c4
......@@ -21,7 +21,7 @@ index bd711c6..3ca0988 100644
+#elif defined (HAVE_MAEMO) || defined (__ANDROID__)
# include <poll.h>
# define poll(a, b, c) vlc_poll(a, b, c)
int vlc_poll (struct pollfd *, unsigned, int);
#endif
diff --git a/src/network/poll.c b/src/network/poll.c
index 24335c2..aa2e260 100644
--- a/src/network/poll.c
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment