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/include/nuttx/clock.h | |
parent | 4da5bc0a49f0f308eda5b46b41e628111bb079a5 (diff) | |
download | nuttx-8e185b4cba702e2c98922ea211e3496bb814702f.tar.gz nuttx-8e185b4cba702e2c98922ea211e3496bb814702f.tar.bz2 nuttx-8e185b4cba702e2c98922ea211e3496bb814702f.zip |
Back out and replace recent kludges for errno and clock_systimer. There is a cleaner way
Diffstat (limited to 'nuttx/include/nuttx/clock.h')
-rw-r--r-- | nuttx/include/nuttx/clock.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/nuttx/include/nuttx/clock.h b/nuttx/include/nuttx/clock.h index 18c67fe16..898aa1026 100644 --- a/nuttx/include/nuttx/clock.h +++ b/nuttx/include/nuttx/clock.h @@ -71,18 +71,12 @@ # define __HAVE_KERNEL_GLOBALS 0 -#elif defined(CONFIG_BUILD_PROTECTED) -# if defined(__KERNEL__) +#elif defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__) /* Case 3: Kernel mode of protected kernel build */ # define __HAVE_KERNEL_GLOBALS 1 -# else - /* User mode of protected kernel build */ - -# define __HAVE_KERNEL_GLOBALS 0 -# endif -#elif defined(CONFIG_BUILD_KERNEL) +#elif defined(CONFIG_BUILD_KERNEL) && defined(__KERNEL__) /* Case 3: Kernel only build */ # define __HAVE_KERNEL_GLOBALS 1 |