[FFmpeg-cvslog] Merge commit '29ccc641b17afad058a5c24071ea827865a8b3a9'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 16:09:09 2017 -0300| [869401cefc22e221edbf135bacaa1f21014fd001] | committer: James Almer

Merge commit '29ccc641b17afad058a5c24071ea827865a8b3a9'

* commit '29ccc641b17afad058a5c24071ea827865a8b3a9':
  build: Drop check for sys/mman.h in favor of mmap() check

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=869401cefc22e221edbf135bacaa1f21014fd001
---

 configure          | 2 --
 libswscale/utils.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/configure b/configure
index 7fe9d80ecc..175559bd55 100755
--- 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
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


======================================================================

diff --cc configure
index 7fe9d80ecc,2f6f6e7fca..175559bd55
--- a/configure
+++ b/configure
@@@ -5757,22 -4652,15 +5756,21 @@@ check_func_headers windows.h SetConsole
  check_func_headers windows.h Sleep
  check_func_headers windows.h VirtualAlloc
  check_struct windows.h "CONDITION_VARIABLE" Ptr
 +check_func_headers glob.h glob
 +enabled xlib &&
 +    check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext
  
  check_header direct.h
 +check_header dirent.h
  check_header dxgidebug.h
  check_header dxva.h
 -check_header dxva2api.h
 +check_header dxva2api.h -D_WIN32_WINNT=0x0600
  check_header io.h
 +check_header libcrystalhd/libcrystalhd_if.h
  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