summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-10-03 10:20:46 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-10-03 10:20:46 -0600
commit25dcd00e237144cc1666375c708709f7dd4f7783 (patch)
tree977a25949099a1ccd350a183fec1122dbfeca740
parente6f66f07ebc8f922de510a6a02f95f1bc1fbba7d (diff)
downloadnuttx-25dcd00e237144cc1666375c708709f7dd4f7783.tar.gz
nuttx-25dcd00e237144cc1666375c708709f7dd4f7783.tar.bz2
nuttx-25dcd00e237144cc1666375c708709f7dd4f7783.zip
Fix build error with CONFIG_SYSTEM_TIME64
-rw-r--r--nuttx/sched/clock/clock.h1
-rw-r--r--nuttx/sched/clock/clock_systimer.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/nuttx/sched/clock/clock.h b/nuttx/sched/clock/clock.h
index 4a05bca02..70eb23fef 100644
--- a/nuttx/sched/clock/clock.h
+++ b/nuttx/sched/clock/clock.h
@@ -66,6 +66,7 @@
/********************************************************************************
* Global Variables
********************************************************************************/
+
#if !defined(CONFIG_SCHED_TICKLESS) && !defined(__HAVE_KERNEL_GLOBALS)
/* The system clock exists (CONFIG_SCHED_TICKLESS), but it not prototyped
* globally in include/nuttx/clock.h.
diff --git a/nuttx/sched/clock/clock_systimer.c b/nuttx/sched/clock/clock_systimer.c
index 5d49b019f..530d4b18c 100644
--- a/nuttx/sched/clock/clock_systimer.c
+++ b/nuttx/sched/clock/clock_systimer.c
@@ -52,6 +52,7 @@
/* See nuttx/clock.h */
#undef clock_systimer
+#undef clock_systimer64
/****************************************************************************
* Private Data