sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from master

Browse Source
This commit is contained in:
Gregory Nutt 2014-06-23 11:10:24 -06:00
commit dbcbbf1adf
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -7465,3 +7465,6 @@
write buffering logic to use I/O buffer chains (not tested on initial write buffering logic to use I/O buffer chains (not tested on initial
check-in) (2014-6-22). 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).

2
include/time.h
View File

@ -99,7 +99,7 @@
* system time-of-day clock. * system time-of-day clock.
*/ */
#ifdef CLOCK_MONOTONIC #ifdef CONFIG_CLOCK_MONOTONIC
# define CLOCK_MONOTONIC 2 # define CLOCK_MONOTONIC 2
#endif #endif

2
sched/clock_gettime.c
View File

@ -107,7 +107,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
sdbg("clock_id=%d\n", clock_id); sdbg("clock_id=%d\n", clock_id);
DEBUGASSERT(tp != NULL); DEBUGASSERT(tp != NULL);
#ifdef CLOCK_MONOTONIC #ifdef CONFIG_CLOCK_MONOTONIC
/* CLOCK_MONOTONIC is an optional under POSIX: "If the Monotonic Clock /* CLOCK_MONOTONIC is an optional under POSIX: "If the Monotonic Clock
* option is supported, all implementations shall support a clock_id * option is supported, all implementations shall support a clock_id
* of CLOCK_MONOTONIC defined in <time.h>. This clock represents the * of CLOCK_MONOTONIC defined in <time.h>. This clock represents the