From bc3108440bbec339f34e96849d7cd9de10bfd93d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 23 Jun 2014 11:01:31 -0600 Subject: Fix conditional compilation for CLOCK_MONTONIC. From Manuel Stühn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nuttx/include/time.h | 2 +- nuttx/sched/clock_gettime.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nuttx/include/time.h b/nuttx/include/time.h index e8853ef89..414e19995 100644 --- a/nuttx/include/time.h +++ b/nuttx/include/time.h @@ -99,7 +99,7 @@ * system time-of-day clock. */ -#ifdef CLOCK_MONOTONIC +#ifdef CONFIG_CLOCK_MONOTONIC # define CLOCK_MONOTONIC 2 #endif diff --git a/nuttx/sched/clock_gettime.c b/nuttx/sched/clock_gettime.c index ebc06548d..c7beb8295 100644 --- a/nuttx/sched/clock_gettime.c +++ b/nuttx/sched/clock_gettime.c @@ -107,7 +107,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp) sdbg("clock_id=%d\n", clock_id); DEBUGASSERT(tp != NULL); -#ifdef CLOCK_MONOTONIC +#ifdef CONFIG_CLOCK_MONOTONIC /* CLOCK_MONOTONIC is an optional under POSIX: "If the Monotonic Clock * option is supported, all implementations shall support a clock_id * of CLOCK_MONOTONIC defined in . This clock represents the -- cgit v1.2.3 From 60436eacfbf3dd6f62d7aea4ad56947736ae2efb Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 23 Jun 2014 11:02:28 -0600 Subject: Update changelog --- nuttx/ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index e9b61b389..d42079868 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -7461,4 +7461,6 @@ * tools/mkfsdata.pl: Apparently, the trailing the 0x00 in http server files is seen as a bug in javascript and images. From Max/Himax (2014-6-19). - + * include/time.h and sched/clock_gettime.c: Fix typo in conditional + compilation: CONFIG_CLOCK_MONOTONIC vs. CLOCK_MONOTONIC. From Manuel + Stühn (2014-6-23). -- cgit v1.2.3