summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure2
-rw-r--r--ffmpeg.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure
index 7faf28134d..f76f03cdd4 100755
--- a/configure
+++ b/configure
@@ -758,6 +758,7 @@ HAVE_LIST="
soundcard_h
poll_h
sys_mman_h
+ sys_resource_h
sys_select_h
sys_soundcard_h
termios_h
@@ -1577,6 +1578,7 @@ check_header conio.h
check_header dlfcn.h
check_header malloc.h
check_header sys/mman.h
+check_header sys/resource.h
check_header termios.h
if ! enabled_any memalign memalign_hack && enabled need_memalign ; then
diff --git a/ffmpeg.c b/ffmpeg.c
index 733ff0d782..874418bad6 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -36,7 +36,9 @@
#include "avstring.h"
#include "os_support.h"
-#if !defined(HAVE_GETRUSAGE) && defined(HAVE_GETPROCESSTIMES)
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#elif defined(HAVE_GETPROCESSTIMES)
#include <windows.h>
#endif
@@ -46,7 +48,6 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include <termios.h>
-#include <sys/resource.h>
#elif defined(HAVE_CONIO_H)
#include <conio.h>
#endif