MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

os_support: Rename the poll fallback function to ff_poll

Browse Source 
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>
This commit is contained in:
Martin Storsjö 2012-06-25 12:27:37 +03:00
parent cdee08e365
commit cab2eb87f9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/os_support.c
View File

@ -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;

3
libavformat/os_support.h
View File

@ -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 */