diff options
| author | Luca Abeni <lucabe72@email.it> | 2008-02-13 12:51:14 +0000 |
|---|---|---|
| committer | Luca Abeni <lucabe72@email.it> | 2008-02-13 12:51:14 +0000 |
| commit | f8cda19ee6285cc83471f87357a1c6f6076706ef (patch) | |
| tree | b5795202deeaa819074e9b0b3f51b95ebef16b0c | |
| parent | d435e520d813c5f3e0c06359e145432a3325d880 (diff) | |
Include poll.h instead of sys/poll.h
Originally committed as revision 11924 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | ffserver.c | 4 | ||||
| -rw-r--r-- | libavformat/os_support.c | 6 | ||||
| -rw-r--r-- | libavformat/os_support.h | 4 |
4 files changed, 9 insertions, 9 deletions
@@ -745,7 +745,7 @@ HAVE_LIST=" sdl_video_size socklen_t soundcard_h - sys_poll_h + poll_h sys_select_h sys_soundcard_h termios_h @@ -1595,7 +1595,7 @@ enabled zlib && check_lib zlib.h zlibVersion -lz || disable zlib # ffserver uses poll(), # if it's not found we can emulate it using select(). if enabled ffserver; then - check_header sys/poll.h + check_header poll.h check_header sys/select.h fi diff --git a/ffserver.c b/ffserver.c index d2520d08fb..6742e58354 100644 --- a/ffserver.c +++ b/ffserver.c @@ -34,8 +34,8 @@ #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> +#ifdef HAVE_POLL_H +#include <poll.h> #endif #include <errno.h> #include <sys/time.h> diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 025797b942..cc109d5967 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -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 @@ int ff_socket_nonblock(int socket, int enable) #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 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout) return rc; } -#endif /* HAVE_SYS_POLL_H */ +#endif /* HAVE_POLL_H */ #endif /* CONFIG_FFSERVER */ diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 1c57895ab6..67d586ab65 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -62,7 +62,7 @@ __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds); #endif #ifdef CONFIG_FFSERVER -#ifndef HAVE_SYS_POLL_H +#ifndef HAVE_POLL_H typedef unsigned long nfds_t; struct pollfd { @@ -87,7 +87,7 @@ struct pollfd { 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 */ |