[FFmpeg-cvslog] Merge commit '4064f42889685e7122cfad4934b060098c147753'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 16:03:21 2017 -0300| [1409c2b7baa92ee1db211ce7a643907d9cbd7187] | committer: James Almer

Merge commit '4064f42889685e7122cfad4934b060098c147753'

* commit '4064f42889685e7122cfad4934b060098c147753':
  build: Drop explicit check for dlfcn.h

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

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

 configure | 2 --
 1 file changed, 2 deletions(-)

diff --git a/configure b/configure
index a647575adf..d01dd71a2e 100755
--- a/configure
+++ b/configure
@@ -1924,7 +1924,6 @@ HEADERS_LIST="
     dev_video_meteor_ioctl_meteor_h
     direct_h
     dirent_h
-    dlfcn_h
     dxgidebug_h
     dxva_h
     ES2_gl_h
@@ -5766,7 +5765,6 @@ enabled xlib &&
 check_header d3d11.h
 check_header direct.h
 check_header dirent.h
-check_header dlfcn.h
 check_header dxgidebug.h
 check_header dxva.h
 check_header dxva2api.h -D_WIN32_WINNT=0x0600


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

diff --cc configure
index a647575adf,d0592347a1..d01dd71a2e
--- a/configure
+++ b/configure
@@@ -1923,11 -1568,8 +1923,10 @@@ HEADERS_LIST=
      dev_video_bktr_ioctl_bt848_h
      dev_video_meteor_ioctl_meteor_h
      direct_h
 +    dirent_h
-     dlfcn_h
      dxgidebug_h
      dxva_h
 +    ES2_gl_h
      gsm_h
      io_h
      mach_mach_time_h
@@@ -5765,16 -4657,12 +5764,15 @@@ enabled xlib &
  
  check_header d3d11.h
  check_header direct.h
 +check_header dirent.h
- check_header dlfcn.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