diff options
| author | Michael Kostylev <michael.kostylev@gmail.com> | 2007-12-27 01:38:50 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-12-27 01:38:50 +0000 |
| commit | 81644c2ee08899301efc852281efea4e3b8f7d11 (patch) | |
| tree | cef30b637e1c51ba6d75ceee09f9748c5ef3e9ea | |
| parent | 945208caeaa058ecc477f5e34c526d7bb7c27ddb (diff) | |
| download | ffmpeg-81644c2ee08899301efc852281efea4e3b8f7d11.tar.gz | |
Check for the presence of sys/select.h and conditionally #include it.
patch by Michael Kostylev, mik niipt ru
Originally committed as revision 11324 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavformat/os_support.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -718,6 +718,7 @@ HAVE_LIST=" sdl_video_size soundcard_h sys_poll_h + sys_select_h sys_soundcard_h termios_h threads @@ -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 enabled ffserver; then check_header sys/poll.h + check_header sys/select.h fi # check for some common methods of building with pthread support diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 983523b9f5..025797b942 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -29,7 +29,7 @@ #ifndef HAVE_SYS_POLL_H #ifdef HAVE_WINSOCK2_H #include <winsock2.h> -#else +#elif defined (HAVE_SYS_SELECT_H) #include <sys/select.h> #endif #endif |