summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-12-09 01:26:55 +0100
committerPau Espin Pedrol <pespin@sysmocom.de>2018-12-10 11:02:16 +0100
commit2ca8cebac67cfa179af77aa8d507fd4b96b2b230 (patch)
treedcc10aa0a2dcf211e7865484deaf31343607158a
parent4f4905fac590be8feea0b22010444ed40d7b11b5 (diff)
timer: Fix clockid_t undefined on MacOS < 10.12
Related: OS#3722 Change-Id: If466a64bd44dcb8ae8a9b7f82bc9c9435ba3e640
-rw-r--r--include/osmocom/core/timer.h1
-rw-r--r--include/osmocom/core/timer_compat.h4
2 files changed, 5 insertions, 0 deletions
diff --git a/include/osmocom/core/timer.h b/include/osmocom/core/timer.h
index caf4c678..19797662 100644
--- a/include/osmocom/core/timer.h
+++ b/include/osmocom/core/timer.h
@@ -45,6 +45,7 @@
#include <osmocom/core/linuxlist.h>
#include <osmocom/core/linuxrbtree.h>
+#include <osmocom/core/timer_compat.h>
/* convert absolute time (in seconds) to elapsed days/hours/minutes */
#define OSMO_SEC2MIN(sec) ((sec % (60 * 60)) / 60)
diff --git a/include/osmocom/core/timer_compat.h b/include/osmocom/core/timer_compat.h
index 8fdd0a08..916f5684 100644
--- a/include/osmocom/core/timer_compat.h
+++ b/include/osmocom/core/timer_compat.h
@@ -27,6 +27,10 @@
#pragma once
+/* MacOS < 10.12 Sierra does not define clockid_t */
+#if defined(__APPLE__) && (!defined(__DARWIN_C_LEVEL) || __DARWIN_C_LEVEL < 199309L)
+typedef int clockid_t;
+#endif
/* Convenience macros for operations on timevals.
NOTE: `timercmp' does not work for >= or <=. */