[FFmpeg-cvslog] build: Merge mach/mach_time.h and mach_absolute_time() checks

[Diego Biurrun]

ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Oct  7 03:16:11 2017 +0200| [b46900914a1f25ce8dbf49d7c53766ff1f18b60f] | committer: Diego Biurrun

build: Merge mach/mach_time.h and mach_absolute_time() checks

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

 configure         | 4 +---
 libavutil/timer.h | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index bc29d1912f..c5d4e262d6 100755
--- a/configure
+++ b/configure
@@ -1556,7 +1556,6 @@ HEADERS_LIST="
     dxgidebug_h
     dxva_h
     io_h
-    mach_mach_time_h
     machine_ioctl_bt848_h
     machine_ioctl_meteor_h
     malloc_h
@@ -4565,7 +4564,6 @@ check_func  gettimeofday
 check_func  gmtime_r
 check_func  isatty
 check_func  localtime_r
-check_func  mach_absolute_time
 check_func  mkstemp
 check_func  mmap
 check_func  mprotect
@@ -4579,6 +4577,7 @@ check_func  sysctl
 check_func  usleep
 
 check_func_headers io.h setmode
+check_func_headers mach/mach_time.h mach_absolute_time
 check_func_headers stdlib.h getenv
 
 check_func_headers windows.h GetProcessAffinityMask
@@ -4596,7 +4595,6 @@ check_header dxgidebug.h
 check_header dxva.h
 check_header dxva2api.h
 check_header io.h
-check_header mach/mach_time.h
 check_header malloc.h
 check_header poll.h
 check_header sys/param.h
diff --git a/libavutil/timer.h b/libavutil/timer.h
index cc4c5a5901..8468159d92 100644
--- a/libavutil/timer.h
+++ b/libavutil/timer.h
@@ -32,7 +32,7 @@
 
 #include "config.h"
 
-#if HAVE_MACH_MACH_TIME_H
+#if HAVE_MACH_ABSOLUTE_TIME
 #include <mach/mach_time.h>
 #endif