mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '29ccc641b17afad058a5c24071ea827865a8b3a9'
* commit '29ccc641b17afad058a5c24071ea827865a8b3a9': build: Drop check for sys/mman.h in favor of mmap() check Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
869401cefc
|
@ -1937,7 +1937,6 @@ HEADERS_LIST="
|
||||||
poll_h
|
poll_h
|
||||||
soundcard_h
|
soundcard_h
|
||||||
stdatomic_h
|
stdatomic_h
|
||||||
sys_mman_h
|
|
||||||
sys_param_h
|
sys_param_h
|
||||||
sys_resource_h
|
sys_resource_h
|
||||||
sys_select_h
|
sys_select_h
|
||||||
|
@ -5772,7 +5771,6 @@ check_header mach/mach_time.h
|
||||||
check_header malloc.h
|
check_header malloc.h
|
||||||
check_header net/udplite.h
|
check_header net/udplite.h
|
||||||
check_header poll.h
|
check_header poll.h
|
||||||
check_header sys/mman.h
|
|
||||||
check_header sys/param.h
|
check_header sys/param.h
|
||||||
check_header sys/resource.h
|
check_header sys/resource.h
|
||||||
check_header sys/select.h
|
check_header sys/select.h
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#if HAVE_SYS_MMAN_H
|
#if HAVE_MMAP
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
|
#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
|
||||||
#define MAP_ANONYMOUS MAP_ANON
|
#define MAP_ANONYMOUS MAP_ANON
|
||||||
|
|
Loading…
Reference in New Issue