Commit f4e7b7d9 authored by diego's avatar diego

Check for the presence of sys/select.h and conditionally #include it.

patch by Michael Kostylev, mik niipt ru


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11324 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 7c7d67fe
...@@ -718,6 +718,7 @@ HAVE_LIST=" ...@@ -718,6 +718,7 @@ HAVE_LIST="
sdl_video_size sdl_video_size
soundcard_h soundcard_h
sys_poll_h sys_poll_h
sys_select_h
sys_soundcard_h sys_soundcard_h
termios_h termios_h
threads threads
...@@ -1563,6 +1564,7 @@ enabled zlib && check_lib zlib.h zlibVersion -lz || disable zlib ...@@ -1563,6 +1564,7 @@ enabled zlib && check_lib zlib.h zlibVersion -lz || disable zlib
# 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 sys/poll.h
check_header sys/select.h
fi fi
# check for some common methods of building with pthread support # check for some common methods of building with pthread support
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#ifndef HAVE_SYS_POLL_H #ifndef HAVE_SYS_POLL_H
#ifdef HAVE_WINSOCK2_H #ifdef HAVE_WINSOCK2_H
#include <winsock2.h> #include <winsock2.h>
#else #elif defined (HAVE_SYS_SELECT_H)
#include <sys/select.h> #include <sys/select.h>
#endif #endif
#endif #endif
......
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