virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
Originally committed as revision 13075 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2008-05-08 00:44:42 +00:00
parent 3f89d9c000
commit b091aa44b7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -758,6 +758,7 @@ HAVE_LIST="
soundcard_h soundcard_h
poll_h poll_h
sys_mman_h sys_mman_h
sys_resource_h
sys_select_h sys_select_h
sys_soundcard_h sys_soundcard_h
termios_h termios_h
@ -1577,6 +1578,7 @@ check_header conio.h
check_header dlfcn.h check_header dlfcn.h
check_header malloc.h check_header malloc.h
check_header sys/mman.h check_header sys/mman.h
check_header sys/resource.h
check_header termios.h check_header termios.h
if ! enabled_any memalign memalign_hack && enabled need_memalign ; then if ! enabled_any memalign memalign_hack && enabled need_memalign ; then

5
ffmpeg.c
View File

@ -36,7 +36,9 @@
#include "avstring.h" #include "avstring.h"
#include "os_support.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> #include <windows.h>
#endif #endif
@ -46,7 +48,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/time.h> #include <sys/time.h>
#include <termios.h> #include <termios.h>
#include <sys/resource.h>
#elif defined(HAVE_CONIO_H) #elif defined(HAVE_CONIO_H)
#include <conio.h> #include <conio.h>
#endif #endif