diff options
| author | Diego Biurrun <diego@biurrun.de> | 2017-10-07 03:16:11 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-10-12 20:04:16 +0200 |
| commit | b46900914a1f25ce8dbf49d7c53766ff1f18b60f (patch) | |
| tree | 6cb899bb0c98c13e4561b25bdb0d9bcd4f95df21 | |
| parent | 4f6401df43d7ee9082ea591037b9f9284217d834 (diff) | |
| download | ffmpeg-b46900914a1f25ce8dbf49d7c53766ff1f18b60f.tar.gz | |
build: Merge mach/mach_time.h and mach_absolute_time() checks
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavutil/timer.h | 2 |
2 files changed, 2 insertions, 4 deletions
@@ -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 |