[FFmpeg-cvslog] r13075 - in trunk: configure ffmpeg.c

[ramiro]

Author: ramiro
Date: Thu May  8 02:44:42 2008
New Revision: 13075

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

Modified:
   trunk/configure
   trunk/ffmpeg.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu May  8 02:44:42 2008
@@ -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

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Thu May  8 02:44:42 2008
@@ -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