On Tue, 26 Jun 2012, Diego Biurrun wrote:

On Tue, Jun 26, 2012 at 03:12:34PM +0300, Martin Storsjö wrote:
--- 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)
 {
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -104,7 +104,8 @@ struct pollfd {

-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

It's not clear to me why you need this and the log message
does not help.

Because I don't want libavformat defining nonstatic symbols outside of the ff/av prefixes. Consider the implications if you build an app that links to libavformat, and also link in another library which perhaps has a different poll wrapper with the same name.

// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to