aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2008-05-08 00:44:42 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2008-05-08 00:44:42 +0000
commitb091aa44b7c88ab4ff69949bf8903b4372e0c4a6 (patch)
tree549f694828280cab1a18c5ee783b5a71915601cc /ffmpeg.c
parent3f89d9c0000d313a0103a7d91fd9208e8744275b (diff)
downloadffmpeg-b091aa44b7c88ab4ff69949bf8903b4372e0c4a6.tar.gz
Check for sys/resource.h and include it conditionally.
Originally committed as revision 13075 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c5
1 files changed, 3 insertions, 2 deletions
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