aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-06-24 22:20:21 +0300
committerMartin Storsjö <martin@martin.st>2012-06-26 17:22:21 +0300
commite64bceeac0cdf312d9481b3dd1ec1fda7ee2b94c (patch)
treebc22e590a3c8d6eaded944bade643b904268787b
parent39dba5aa1b919c4b40619895bf3b4936fbe29deb (diff)
downloadffmpeg-e64bceeac0cdf312d9481b3dd1ec1fda7ee2b94c.tar.gz
configure: Check for sys/time.h
Apparently this include is needed on some systems for building the poll fallback (for the timeval struct for select?), but it isn't available on all systems. Thus only include it if it exists. Signed-off-by: Martin Storsjö <martin@martin.st>
-rwxr-xr-xconfigure2
-rw-r--r--libavformat/os_support.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/configure b/configure
index aa1856d673..52c25b484c 100755
--- a/configure
+++ b/configure
@@ -1148,6 +1148,7 @@ HAVE_LIST="
sys_resource_h
sys_select_h
sys_soundcard_h
+ sys_time_h
sys_videoio_h
threads
trunc
@@ -2873,6 +2874,7 @@ check_header sys/mman.h
check_header sys/param.h
check_header sys/resource.h
check_header sys/select.h
+check_header sys/time.h
check_header unistd.h
check_header vdpau/vdpau.h
check_header vdpau/vdpau_x11.h
diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index eaada4be0b..0cbaf453db 100644
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -58,7 +58,9 @@ int ff_win32_open(const char *filename_utf8, int oflag, int pmode)
#if CONFIG_NETWORK
#include <fcntl.h>
#if !HAVE_POLL_H
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
+#endif
#if HAVE_WINSOCK2_H
#include <winsock2.h>
#elif HAVE_SYS_SELECT_H