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.
---
libavformat/os_support.c | 2 +-
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 b711913..0eaea5c 100644
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -264,7 +264,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 b0ee86a..25a0448 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -113,7 +113,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 */
--
1.7.9.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
