From: Rusty Russell Date: Sun, 22 Jun 2014 23:49:08 +0000 (+0930) Subject: time: update for new configurator. X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=58c5a3524737ec1f6500dd766f717e2f158fc5c0 time: update for new configurator. HAVE_CLOCK_GETTIME_IN_LIBRT now implies HAVE_CLOCK_GETTIME. Signed-off-by: Rusty Russell --- diff --git a/ccan/time/time.c b/ccan/time/time.c index 8e7fbffe..d0542f56 100644 --- a/ccan/time/time.c +++ b/ccan/time/time.c @@ -3,7 +3,7 @@ #include #include -#if !HAVE_CLOCK_GETTIME && !HAVE_CLOCK_GETTIME_IN_LIBRT +#if !HAVE_CLOCK_GETTIME #include struct timeabs time_now(void) @@ -23,7 +23,7 @@ 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) { diff --git a/ccan/time/time.h b/ccan/time/time.h index 287558d0..5c916f4c 100644 --- a/ccan/time/time.h +++ b/ccan/time/time.h @@ -66,7 +66,7 @@ struct timemono { * Otherwise time_mono() just refers to time_now(). Your code might * test this if you really need a monotonic clock. */ -#if (HAVE_CLOCK_GETTIME || HAVE_CLOCK_GETTIME_IN_LIBRT) && defined(CLOCK_MONOTONIC) +#if HAVE_CLOCK_GETTIME && defined(CLOCK_MONOTONIC) #define TIME_HAVE_MONOTONIC 1 #endif