From 3b6181b63d80e77c04a52d7439a87850eea1fe78 Mon Sep 17 00:00:00 2001 From: Felix Fietkau <nbd@nbd.name> Date: Fri, 20 Jan 2017 11:29:51 +0100 Subject: [PATCH] utils: fix build on Mac OS X 10.12 clock_gettime and CLOCK_MONOTONIC are supported now Signed-off-by: Felix Fietkau <nbd@nbd.name> --- utils.c | 2 +- utils.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/utils.c b/utils.c index e59002e..5d9d5aa 100644 --- a/utils.c +++ b/utils.c @@ -56,7 +56,7 @@ void *__calloc_a(size_t len, ...) return ret; } -#ifdef __APPLE__ +#ifdef LIBUBOX_COMPAT_CLOCK_GETTIME #include <mach/mach_host.h> /* host_get_clock_service() */ #include <mach/mach_port.h> /* mach_port_deallocate() */ #include <mach/mach_init.h> /* mach_host_self(), mach_task_self() */ diff --git a/utils.h b/utils.h index 803150b..cd09cc0 100644 --- a/utils.h +++ b/utils.h @@ -57,7 +57,8 @@ extern int __BUILD_BUG_ON_CONDITION_FAILED; #define BUILD_BUG_ON __BUILD_BUG_ON #endif -#ifdef __APPLE__ +#if defined(__APPLE__) && !defined(CLOCK_MONOTONIC) +#define LIBUBOX_COMPAT_CLOCK_GETTIME #include <mach/clock_types.h> #define CLOCK_REALTIME CALENDAR_CLOCK -- 2.30.2