Commit 66252841 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

vlc_poll: no conditional symbols

I would rather we move all the replacement functions to a dedicated
static import library (in future versions) though. It kinda sucks to
clutter libvlccore with such symbols.
parent 57eb2fb1
......@@ -181,7 +181,8 @@ struct pollfd
int revents;
};
VLC_EXPORT (int, poll, (struct pollfd *fds, unsigned nfds, int timeout));
VLC_EXPORT (int, vlc_poll, (struct pollfd *fds, unsigned nfds, int timeout));
# define poll(a, b, c) vlc_poll(a, b, c)
#endif
#ifdef WIN32
......
......@@ -278,7 +278,6 @@ playlist_ServicesDiscoveryRemove
playlist_TreeMove
__pl_Release
__pl_Yield
poll
resolve_xml_special_chars
sdp_AddAttribute
sdp_AddMedia
......@@ -452,6 +451,7 @@ __vlc_object_unlock
__vlc_object_wait
__vlc_object_waitpipe
__vlc_object_yield
vlc_poll
vlc_pthread_fatal
vlc_rand_bytes
vlc_recvmsg
......
......@@ -27,12 +27,19 @@
#include <vlc_common.h>
#ifndef HAVE_POLL
#ifdef HAVE_POLL
struct pollfd;
int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
{
return poll (fds, nfds, timeout);
}
#else /* !HAVE_POLL */
#include <string.h>
#include <stdlib.h>
#include <vlc_network.h>
int poll (struct pollfd *fds, unsigned nfds, int timeout)
int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
{
fd_set rdset, wrset, exset;
struct timeval tv = { 0, 0 };
......
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