Check for sys/resource.h and include it conditionally.

Originally committed as revision 13075 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 7faf28134dc7021cf2008ca7d18e95a1c31c2695..f76f03cdd4e52cc07be0519c8835fdd74f3faea5 100755 (executable)
--- 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 733ff0d7822bb9ca32c95c9fccd34a6480a78f5f..874418bad6fc40512dbdfc045a833b8f179e51b3 100644 (file)
--- 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