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/syscall | |
| 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/syscall')
| -rw-r--r-- | nuttx/syscall/syscall.csv | 6 | ||||
| -rw-r--r-- | nuttx/syscall/syscall_stublookup.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/syscall/syscall.csv b/nuttx/syscall/syscall.csv index 1f7a2e759..3c734d2d7 100644 --- a/nuttx/syscall/syscall.csv +++ b/nuttx/syscall/syscall.csv @@ -6,7 +6,7 @@ "clock_getres","time.h","","int","clockid_t","struct timespec*" "clock_gettime","time.h","","int","clockid_t","struct timespec*" "clock_settime","time.h","","int","clockid_t","const struct timespec*" -"clock_systimer","nuttx/syscall.h","","uint32_t" +"clock_systimer","nuttx/clock.h","","uint32_t" "close","unistd.h","CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0","int","int" "closedir","dirent.h","CONFIG_NFILE_DESCRIPTORS > 0","int","FAR DIR*" "connect","sys/socket.h","CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)","int","int","FAR const struct sockaddr*","socklen_t" @@ -18,7 +18,7 @@ "fcntl","fcntl.h","CONFIG_NFILE_DESCRIPTORS > 0","int","int","int","..." "fs_fdopen","nuttx/fs/fs.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","FAR struct file_struct*","int","int","FAR struct tcb_s*" "fsync","unistd.h","CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT)","int","int" -"get_errno","nuttx/syscall.h","","int" +"get_errno","errno.h","","int" "getenv","stdlib.h","!defined(CONFIG_DISABLE_ENVIRON)","FAR char*","FAR const char*" "getpid","unistd.h","","pid_t" "getsockopt","sys/socket.h","CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)","int","int","int","int","FAR void*","FAR socklen_t*" @@ -110,7 +110,7 @@ "send","sys/socket.h","CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)","ssize_t","int","FAR const void*","size_t","int" "sendfile","sys/sendfile.h","CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_NET_SENDFILE)","ssize_t","int","int","FAR off_t*","size_t" "sendto","sys/socket.h","CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)","ssize_t","int","FAR const void*","size_t","int","FAR const struct sockaddr*","socklen_t" -"set_errno","nuttx/syscall.h","","void","int" +"set_errno","errno.h","","void","int" "setenv","stdlib.h","!defined(CONFIG_DISABLE_ENVIRON)","int","const char*","const char*","int" "setsockopt","sys/socket.h","CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)","int","int","int","int","FAR const void*","socklen_t" "sigaction","signal.h","!defined(CONFIG_DISABLE_SIGNALS)","int","int","FAR const struct sigaction*","FAR struct sigaction*" diff --git a/nuttx/syscall/syscall_stublookup.c b/nuttx/syscall/syscall_stublookup.c index 9a5a6206f..e8ea0782e 100644 --- a/nuttx/syscall/syscall_stublookup.c +++ b/nuttx/syscall/syscall_stublookup.c @@ -46,7 +46,7 @@ * a kernel build. */ -#if defined(CONFIG_LIB_SYSCALL) && defined(__KERNEL__) +#if defined(CONFIG_LIB_SYSCALL) /**************************************************************************** * Pre-processor definitions @@ -341,4 +341,4 @@ const uintptr_t g_stublookup[SYS_nsyscalls] = * Public Functions ****************************************************************************/ -#endif /* CONFIG_LIB_SYSCALL && __KERNEL__ */ +#endif /* CONFIG_LIB_SYSCALL */ |