diff options
-rw-r--r-- | libavformat/os_support.c | 2 | ||||
-rw-r--r-- | libavformat/os_support.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 49ec0c60d1..6d8c8ac6a3 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -266,7 +266,7 @@ int ff_socket_nonblock(int socket, int enable) } #if !HAVE_POLL_H -int poll(struct pollfd *fds, nfds_t numfds, int timeout) +int ff_poll(struct pollfd *fds, nfds_t numfds, int timeout) { fd_set read_set; fd_set write_set; diff --git a/libavformat/os_support.h b/libavformat/os_support.h index cda84b0296..dfb87ef43a 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -101,7 +101,8 @@ struct pollfd { #endif -int poll(struct pollfd *fds, nfds_t numfds, int timeout); +int ff_poll(struct pollfd *fds, nfds_t numfds, int timeout); +#define poll ff_poll #endif /* HAVE_POLL_H */ #endif /* CONFIG_NETWORK */ |