From 8e185b4cba702e2c98922ea211e3496bb814702f Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 30 Aug 2014 14:26:56 -0600 Subject: Back out and replace recent kludges for errno and clock_systimer. There is a cleaner way --- nuttx/sched/clock/clock_systimer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'nuttx/sched/clock') diff --git a/nuttx/sched/clock/clock_systimer.c b/nuttx/sched/clock/clock_systimer.c index 1d24803ef..5d49b019f 100644 --- a/nuttx/sched/clock/clock_systimer.c +++ b/nuttx/sched/clock/clock_systimer.c @@ -49,7 +49,10 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ +/* See nuttx/clock.h */ +#undef clock_systimer + /**************************************************************************** * Private Data ****************************************************************************/ @@ -74,7 +77,6 @@ * ****************************************************************************/ -#if !defined(clock_systimer) /* See nuttx/clock.h */ uint32_t clock_systimer(void) { #ifdef CONFIG_SCHED_TICKLESS @@ -104,7 +106,6 @@ uint32_t clock_systimer(void) #endif } -#endif /**************************************************************************** * Name: clock_systimer64 @@ -122,7 +123,6 @@ uint32_t clock_systimer(void) * ****************************************************************************/ -#if !defined(clock_systimer) /* See nuttx/clock.h */ #ifdef CONFIG_SYSTEM_TIME64 uint64_t clock_systimer64(void) { @@ -144,4 +144,3 @@ uint64_t clock_systimer64(void) #endif } #endif -#endif -- cgit v1.2.3