From 36b008695b268a9ca767b693e22ba4c835643e1f Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 30 Aug 2014 14:44:48 -0600
Subject: last change alters semantics of __HAVE_KERNEL_GLOBALS

---
 nuttx/include/nuttx/clock.h | 10 +++-------
 nuttx/sched/clock/clock.h   |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/nuttx/include/nuttx/clock.h b/nuttx/include/nuttx/clock.h
index 898aa1026..c091300db 100644
--- a/nuttx/include/nuttx/clock.h
+++ b/nuttx/include/nuttx/clock.h
@@ -69,8 +69,6 @@
 #if defined(CONFIG_SCHED_TICKLESS)
    /* Case 1: There is no global timer data */
 
-#  define __HAVE_KERNEL_GLOBALS 0
-
 #elif defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)
      /* Case 3: Kernel mode of protected kernel build */
 
@@ -84,8 +82,6 @@
 #elif defined(CONFIG_LIB_SYSCALL)
    /* Case 4: Building with SYSCALLs enabled, but not part of a kernel build */
 
-#  define __HAVE_KERNEL_GLOBALS 0
-
 #else
    /* Case 2: Un-protected, non-kernel build */
 
@@ -192,7 +188,7 @@ struct cpuload_s
  * access to kernel global data
  */
 
-#if __HAVE_KERNEL_GLOBALS
+#ifdef __HAVE_KERNEL_GLOBALS
 #  ifdef CONFIG_SYSTEM_TIME64
 
 extern volatile uint64_t g_system_timer;
@@ -270,7 +266,7 @@ void clock_synchronize(void);
  *
  ****************************************************************************/
 
-#if !__HAVE_KERNEL_GLOBALS
+#ifndef __HAVE_KERNEL_GLOBALS
 #  ifdef CONFIG_SYSTEM_TIME64
 #    define clock_systimer()  (uint32_t)(clock_systimer64() & 0x00000000ffffffff)
 #  else
@@ -297,7 +293,7 @@ uint32_t clock_systimer(void);
  *
  ****************************************************************************/
 
-#if !__HAVE_KERNEL_GLOBALS && defined(CONFIG_SYSTEM_TIME64)
+#if !defined(__HAVE_KERNEL_GLOBALS) && defined(CONFIG_SYSTEM_TIME64)
 uint64_t clock_systimer64(void);
 #endif
 
diff --git a/nuttx/sched/clock/clock.h b/nuttx/sched/clock/clock.h
index f875d3e84..9c4728f7b 100644
--- a/nuttx/sched/clock/clock.h
+++ b/nuttx/sched/clock/clock.h
@@ -66,7 +66,7 @@
 /********************************************************************************
  * Global Variables
  ********************************************************************************/
-#if !defined(CONFIG_SCHED_TICKLESS) && __HAVE_KERNEL_GLOBALS == 0
+#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.
    */
-- 
cgit v1.2.3