diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 16:09:09 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 16:09:09 -0300 |
| commit | 869401cefc22e221edbf135bacaa1f21014fd001 (patch) | |
| tree | 731ddba643d8a14dcd515e326b39caac51c18aa3 | |
| parent | 084e7fbe49fb0935b733726c2b0f7e6ce9553874 (diff) | |
| parent | 29ccc641b17afad058a5c24071ea827865a8b3a9 (diff) | |
| download | ffmpeg-869401cefc22e221edbf135bacaa1f21014fd001.tar.gz | |
Merge commit '29ccc641b17afad058a5c24071ea827865a8b3a9'
* commit '29ccc641b17afad058a5c24071ea827865a8b3a9':
build: Drop check for sys/mman.h in favor of mmap() check
Merged-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libswscale/utils.c | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -1937,7 +1937,6 @@ HEADERS_LIST=" poll_h soundcard_h stdatomic_h - sys_mman_h sys_param_h sys_resource_h sys_select_h @@ -5772,7 +5771,6 @@ check_header mach/mach_time.h check_header malloc.h check_header net/udplite.h check_header poll.h -check_header sys/mman.h check_header sys/param.h check_header sys/resource.h check_header sys/select.h diff --git a/libswscale/utils.c b/libswscale/utils.c index dcab707de6..4df09306d3 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -27,7 +27,7 @@ #include <math.h> #include <stdio.h> #include <string.h> -#if HAVE_SYS_MMAN_H +#if HAVE_MMAP #include <sys/mman.h> #if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) #define MAP_ANONYMOUS MAP_ANON |