time: Change TIME_HAVE_MONOTONIC to be 0/1 rather than defined/undefined

[ccan] / ccan / time / time.c

diff --git a/ccan/time/time.c b/ccan/time/time.c
index 8e7fbffe739da0ba6cebed78b8c7624023269e1b..9810792280c775b2c2d49975739ae34c56af2b67 100644 (file)
--- a/ccan/time/time.c
+++ b/ccan/time/time.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#if !HAVE_CLOCK_GETTIME && !HAVE_CLOCK_GETTIME_IN_LIBRT
+#if !HAVE_CLOCK_GETTIME
 #include <sys/time.h>
 
 struct timeabs time_now(void)
@@ -23,17 +23,17 @@ struct timeabs time_now(void)
        clock_gettime(CLOCK_REALTIME, &ret.ts);
        return TIMEABS_CHECK(ret);
 }
-#endif /* HAVE_CLOCK_GETTIME || HAVE_CLOCK_GETTIME_IN_LIBRT */
+#endif /* HAVE_CLOCK_GETTIME */
 
 struct timemono time_mono(void)
 {
        struct timemono ret;
-#ifdef TIME_HAVE_MONOTONIC
+#if TIME_HAVE_MONOTONIC
        clock_gettime(CLOCK_MONOTONIC, &ret.ts);
 #else /* Best we can do */
        ret.ts = time_now().ts;
 #endif /* !HAVE_TIME_MONOTONIC */
-       return ret;
+       return TIMEMONO_CHECK(ret);
 }
 
 struct timerel time_divide(struct timerel t, unsigned long div)
@@ -128,3 +128,11 @@ struct timeabs timeabs_check(struct timeabs t, const char *abortstr)
        ret.ts = time_check_(t.ts, abortstr);
        return ret;
 }
+
+struct timemono timemono_check(struct timemono t, const char *abortstr)
+{
+       struct timemono ret;
+
+       ret.ts = time_check_(t.ts, abortstr);
+       return ret;
+}