From b091aa44b7c88ab4ff69949bf8903b4372e0c4a6 Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Thu, 8 May 2008 00:44:42 +0000 Subject: [PATCH] Check for sys/resource.h and include it conditionally. Originally committed as revision 13075 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 2 ++ ffmpeg.c | 5 +++-- 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 +#elif defined(HAVE_GETPROCESSTIMES) #include #endif @@ -46,7 +48,6 @@ #include #include #include -#include #elif defined(HAVE_CONIO_H) #include #endif