diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 16:42:27 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 16:42:27 -0300 |
| commit | 4e754e94195b21b49f37471d29841cff2562e320 (patch) | |
| tree | bfb8d08f0cd41c27da432dfe84f5c6c7bf51de71 | |
| parent | 28e012234a9bf9118a69a324de6392ce64fb65d2 (diff) | |
| parent | b46900914a1f25ce8dbf49d7c53766ff1f18b60f (diff) | |
| download | ffmpeg-4e754e94195b21b49f37471d29841cff2562e320.tar.gz | |
Merge commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f'
* commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f':
build: Merge mach/mach_time.h and mach_absolute_time() checks
Merged-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavutil/timer.h | 2 |
2 files changed, 2 insertions, 4 deletions
@@ -1921,7 +1921,6 @@ HEADERS_LIST=" dxva_h ES2_gl_h io_h - mach_mach_time_h machine_ioctl_bt848_h machine_ioctl_meteor_h malloc_h @@ -5706,7 +5705,6 @@ check_func getopt check_func getrusage check_func gettimeofday check_func isatty -check_func mach_absolute_time check_func mkstemp check_func mmap check_func mprotect @@ -5723,6 +5721,7 @@ check_func usleep check_func_headers conio.h kbhit check_func_headers io.h setmode check_func_headers lzo/lzo1x.h lzo1x_999_compress +check_func_headers mach/mach_time.h mach_absolute_time check_func_headers stdlib.h getenv check_func_headers sys/stat.h lstat @@ -5748,7 +5747,6 @@ check_header dxva.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 diff --git a/libavutil/timer.h b/libavutil/timer.h index f7ab455df2..0bb353cfce 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -42,7 +42,7 @@ #include <stdint.h> #include <inttypes.h> -#if HAVE_MACH_MACH_TIME_H +#if HAVE_MACH_ABSOLUTE_TIME #include <mach/mach_time.h> #endif |