Merge commit '29ccc641b17afad058a5c24071ea827865a8b3a9'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:09:09 +0000 (16:09 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:09:09 +0000 (16:09 -0300)
* commit '29ccc641b17afad058a5c24071ea827865a8b3a9':
  build: Drop check for sys/mman.h in favor of mmap() check

Merged-by: James Almer <jamrial@gmail.com>
configure
libswscale/utils.c

index 7fe9d80..175559b 100755 (executable)
--- a/configure
+++ b/configure
@@ -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
index dcab707..4df0930 100644 (file)
@@ -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