aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-06-25 12:27:37 +0300
committerMartin Storsjö <martin@martin.st>2012-06-30 15:18:17 +0300
commitcab2eb87f9d692f543d11057dbfac4e590570b18 (patch)
treef19ab8cb9b2a15f540d4ea26e12c8c120497862d /libavformat
parentcdee08e36582e443ff8a9bed17ec409551c9f93b (diff)
downloadffmpeg-cab2eb87f9d692f543d11057dbfac4e590570b18.tar.gz
os_support: Rename the poll fallback function to ff_poll
The fallback function is a non-static function, we shouldn't be defining non-static functions outside of the proper ff/av prefix namespaces. This is especially important for a function like poll, which other parties (other libraries, or executables linking these libraries) also might provide similar but incompatible fallbacks for. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/os_support.c2
-rw-r--r--libavformat/os_support.h3
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 */