Mercurial > libavformat.hg
changeset 3039:1135ef610233 libavformat
Include poll.h instead of sys/poll.h
| author | lucabe |
|---|---|
| date | Wed, 13 Feb 2008 12:51:14 +0000 |
| parents | db12cabbe337 |
| children | ca38ffc89883 |
| files | os_support.c os_support.h |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/os_support.c Wed Feb 13 10:58:16 2008 +0000 +++ b/os_support.c Wed Feb 13 12:51:14 2008 +0000 @@ -26,7 +26,7 @@ #include "os_support.h" #ifdef CONFIG_NETWORK -#ifndef HAVE_SYS_POLL_H +#ifndef HAVE_POLL_H #ifdef HAVE_WINSOCK2_H #include <winsock2.h> #elif defined (HAVE_SYS_SELECT_H) @@ -83,7 +83,7 @@ #endif /* CONFIG_NETWORK */ #ifdef CONFIG_FFSERVER -#ifndef HAVE_SYS_POLL_H +#ifndef HAVE_POLL_H int poll(struct pollfd *fds, nfds_t numfds, int timeout) { fd_set read_set; @@ -150,6 +150,6 @@ return rc; } -#endif /* HAVE_SYS_POLL_H */ +#endif /* HAVE_POLL_H */ #endif /* CONFIG_FFSERVER */
--- a/os_support.h Wed Feb 13 10:58:16 2008 +0000 +++ b/os_support.h Wed Feb 13 12:51:14 2008 +0000 @@ -62,7 +62,7 @@ #endif #ifdef CONFIG_FFSERVER -#ifndef HAVE_SYS_POLL_H +#ifndef HAVE_POLL_H typedef unsigned long nfds_t; struct pollfd { @@ -87,7 +87,7 @@ extern int poll(struct pollfd *fds, nfds_t numfds, int timeout); -#endif /* HAVE_SYS_POLL_H */ +#endif /* HAVE_POLL_H */ #endif /* CONFIG_FFSERVER */ #endif /* FFMPEG_OS_SUPPORT_H */