From f8cda19ee6285cc83471f87357a1c6f6076706ef Mon Sep 17 00:00:00 2001 From: Luca Abeni Date: Wed, 13 Feb 2008 12:51:14 +0000 Subject: [PATCH] Include poll.h instead of sys/poll.h Originally committed as revision 11924 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 4 ++-- ffserver.c | 4 ++-- libavformat/os_support.c | 6 +++--- libavformat/os_support.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 27db60cd99..b8f564878f 100755 --- a/configure +++ b/configure @@ -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 #include #include -#ifdef HAVE_SYS_POLL_H -#include +#ifdef HAVE_POLL_H +#include #endif #include #include 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 #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 */