diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-23 11:10:24 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-23 11:10:24 -0600 |
| commit | 16ed90cd1c95c6ac27206195dc78e16b675b331f (patch) | |
| tree | e5608373cc6e94bcaa6168e534d046800ca3c62c | |
| parent | 42b58c01a7df4e04c7fc023200d5e9bd6f8c49da (diff) | |
| parent | 60436eacfbf3dd6f62d7aea4ad56947736ae2efb (diff) | |
| download | nuttx-16ed90cd1c95c6ac27206195dc78e16b675b331f.tar.gz nuttx-16ed90cd1c95c6ac27206195dc78e16b675b331f.tar.bz2 nuttx-16ed90cd1c95c6ac27206195dc78e16b675b331f.zip | |
Merge from master
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/include/time.h | 2 | ||||
| -rw-r--r-- | nuttx/sched/clock_gettime.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index fcccfd40f..c2d5e808b 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -7465,3 +7465,6 @@ write buffering logic to use I/O buffer chains (not tested on initial check-in) (2014-6-22). + * 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). 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 <time.h>. This clock represents the |