diff options
author | Ramiro Polla <ramiro.polla@gmail.com> | 2008-05-08 00:44:42 +0000 |
---|---|---|
committer | Ramiro Polla <ramiro.polla@gmail.com> | 2008-05-08 00:44:42 +0000 |
commit | b091aa44b7c88ab4ff69949bf8903b4372e0c4a6 (patch) | |
tree | 549f694828280cab1a18c5ee783b5a71915601cc /ffmpeg.c | |
parent | 3f89d9c0000d313a0103a7d91fd9208e8744275b (diff) | |
download | ffmpeg-streaming-b091aa44b7c88ab4ff69949bf8903b4372e0c4a6.zip ffmpeg-streaming-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.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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 |