Yet more issues with errno access via syscalls fixed

1 files changed, 12 insertions, 16 deletions

diff --git a/nuttx/syscall/syscall_funclookup.c b/nuttx/syscall/syscall_funclookup.c
index 43e411fc3..5ffd5ca61 100644
--- a/nuttx/syscall/syscall_funclookup.c
+++ b/nuttx/syscall/syscall_funclookup.c
@@ -72,8 +72,19 @@
 #include <mqueue.h>
 #include <spawn.h>
 #include <assert.h>
-#include <errno.h>
 
+/* Errno access is awkward. We need to generate get_errno() and set_errno()
+ * interfaces to support the system calls, even though we don't use them
+ * ourself.
+ *
+ * The "normal" pre-processor defintions for these functions is in errno.h
+ * but we need the internal function prototypes in nuttx/errno.h.
+ */
+
+#undef get_errno
+#undef set_errno
+
+#include <nuttx/errno.h>
 #include <nuttx/clock.h>
 
 /* clock_systimer is a special case:  In the kernel build, proxying for
@@ -93,21 +104,6 @@ uint32_t syscall_clock_systimer(void);
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Errno access is awkward. We need to generate get_errno() and set_errno()
- * interfaces to support the system calls, even though we don't use them
- * ourself.
- *
- * The "normal" protoypes for these functions is in errno.h.  The following
- * must agree exactly.
- */
-
-#ifdef __DIRECT_ERRNO_ACCESS
-#  undef set_errno
-#  undef get_errno
-void set_errno(int errcode);
-int  get_errno(void);
-#endif
-
 /****************************************************************************
  * Public Data
  ****************************************************************************/