From 0daf30675c431967cb203f9460e91f5f7d5c057a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 23 Jun 2014 11:01:31 -0600 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20conditional=20compilation=20for=20CLO?= =?UTF-8?q?CK=5FMONTONIC.=20=20From=20Manuel=20St=C3=BChn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/time.h | 2 +- sched/clock_gettime.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/time.h b/include/time.h index e8853ef898..414e199952 100644 --- a/include/time.h +++ b/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/sched/clock_gettime.c b/sched/clock_gettime.c index ebc06548d0..c7beb8295e 100644 --- a/sched/clock_gettime.c +++ b/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 From e0c16073fafa2f9ac1f9664bfa8f70756e09b205 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 23 Jun 2014 11:02:28 -0600 Subject: [PATCH 2/2] Update changelog --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e9b61b389f..d420798687 100644 --- a/ChangeLog +++ b/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).