diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-30 14:26:56 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-30 14:26:56 -0600 |
| commit | 8e185b4cba702e2c98922ea211e3496bb814702f (patch) | |
| tree | acf7e9dd554df0ade833eaef31975d66a5ba64c6 /nuttx/sched/clock | |
| parent | 4da5bc0a49f0f308eda5b46b41e628111bb079a5 (diff) | |
| download | px4-nuttx-8e185b4cba702e2c98922ea211e3496bb814702f.tar.gz px4-nuttx-8e185b4cba702e2c98922ea211e3496bb814702f.tar.bz2 px4-nuttx-8e185b4cba702e2c98922ea211e3496bb814702f.zip | |
Back out and replace recent kludges for errno and clock_systimer. There is a cleaner way
Diffstat (limited to 'nuttx/sched/clock')
| -rw-r--r-- | nuttx/sched/clock/clock_systimer.c | 7 |
1 files changed, 3 insertions, 4 deletions
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 |