Commit f8cda19e authored by Luca Abeni's avatar Luca Abeni
Browse files

Include poll.h instead of sys/poll.h

Originally committed as revision 11924 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent d435e520
...@@ -745,7 +745,7 @@ HAVE_LIST=" ...@@ -745,7 +745,7 @@ HAVE_LIST="
sdl_video_size sdl_video_size
socklen_t socklen_t
soundcard_h soundcard_h
sys_poll_h poll_h
sys_select_h sys_select_h
sys_soundcard_h sys_soundcard_h
termios_h termios_h
...@@ -1595,7 +1595,7 @@ enabled zlib && check_lib zlib.h zlibVersion -lz || disable zlib ...@@ -1595,7 +1595,7 @@ enabled zlib && check_lib zlib.h zlibVersion -lz || disable zlib
# ffserver uses poll(), # ffserver uses poll(),
# if it's not found we can emulate it using select(). # if it's not found we can emulate it using select().
if enabled ffserver; then if enabled ffserver; then
check_header sys/poll.h check_header poll.h
check_header sys/select.h check_header sys/select.h
fi fi
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#ifdef HAVE_SYS_POLL_H #ifdef HAVE_POLL_H
#include <sys/poll.h> #include <poll.h>
#endif #endif
#include <errno.h> #include <errno.h>
#include <sys/time.h> #include <sys/time.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "os_support.h" #include "os_support.h"
#ifdef CONFIG_NETWORK #ifdef CONFIG_NETWORK
#ifndef HAVE_SYS_POLL_H #ifndef HAVE_POLL_H
#ifdef HAVE_WINSOCK2_H #ifdef HAVE_WINSOCK2_H
#include <winsock2.h> #include <winsock2.h>
#elif defined (HAVE_SYS_SELECT_H) #elif defined (HAVE_SYS_SELECT_H)
...@@ -83,7 +83,7 @@ int ff_socket_nonblock(int socket, int enable) ...@@ -83,7 +83,7 @@ int ff_socket_nonblock(int socket, int enable)
#endif /* CONFIG_NETWORK */ #endif /* CONFIG_NETWORK */
#ifdef CONFIG_FFSERVER #ifdef CONFIG_FFSERVER
#ifndef HAVE_SYS_POLL_H #ifndef HAVE_POLL_H
int poll(struct pollfd *fds, nfds_t numfds, int timeout) int poll(struct pollfd *fds, nfds_t numfds, int timeout)
{ {
fd_set read_set; fd_set read_set;
...@@ -150,6 +150,6 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout) ...@@ -150,6 +150,6 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout)
return rc; return rc;
} }
#endif /* HAVE_SYS_POLL_H */ #endif /* HAVE_POLL_H */
#endif /* CONFIG_FFSERVER */ #endif /* CONFIG_FFSERVER */
...@@ -62,7 +62,7 @@ __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds); ...@@ -62,7 +62,7 @@ __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
#endif #endif
#ifdef CONFIG_FFSERVER #ifdef CONFIG_FFSERVER
#ifndef HAVE_SYS_POLL_H #ifndef HAVE_POLL_H
typedef unsigned long nfds_t; typedef unsigned long nfds_t;
struct pollfd { struct pollfd {
...@@ -87,7 +87,7 @@ struct pollfd { ...@@ -87,7 +87,7 @@ struct pollfd {
extern int poll(struct pollfd *fds, nfds_t numfds, int timeout); extern int poll(struct pollfd *fds, nfds_t numfds, int timeout);
#endif /* HAVE_SYS_POLL_H */ #endif /* HAVE_POLL_H */
#endif /* CONFIG_FFSERVER */ #endif /* CONFIG_FFSERVER */
#endif /* FFMPEG_OS_SUPPORT_H */ #endif /* FFMPEG_OS_SUPPORT_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment