summaryrefslogtreecommitdiffstats
path: root/libc/include
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-13 14:31:02 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-05-13 14:31:02 -0700
commit4aef0ae660e81ca151a04ce0ddaf956275c70116 (patch)
tree5dff7d6f26806adcff6de018bbb1f89c8c662547 /libc/include
parentf4394458301909a83b7ee7f3b436c038b7235ea8 (diff)
parente4fa46e75cd0d433b5c6c064720ed7e195cba7c8 (diff)
downloadbionic-4aef0ae660e81ca151a04ce0ddaf956275c70116.zip
bionic-4aef0ae660e81ca151a04ce0ddaf956275c70116.tar.gz
bionic-4aef0ae660e81ca151a04ce0ddaf956275c70116.tar.bz2
merge from open-source master
Change-Id: I2be62bce462ee53fe9519f433523bd7a44a73d40
Diffstat (limited to 'libc/include')
-rw-r--r--libc/include/sys/linux-syscalls.h4
-rw-r--r--libc/include/sys/linux-unistd.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/libc/include/sys/linux-syscalls.h b/libc/include/sys/linux-syscalls.h
index 30c58fd..6e373e0 100644
--- a/libc/include/sys/linux-syscalls.h
+++ b/libc/include/sys/linux-syscalls.h
@@ -104,7 +104,6 @@
#define __NR_nanosleep (__NR_SYSCALL_BASE + 162)
#define __NR_getitimer (__NR_SYSCALL_BASE + 105)
#define __NR_setitimer (__NR_SYSCALL_BASE + 104)
-#define __NR_sigaction (__NR_SYSCALL_BASE + 67)
#define __NR_sigprocmask (__NR_SYSCALL_BASE + 126)
#define __NR_sigsuspend (__NR_SYSCALL_BASE + 72)
#define __NR_rt_sigaction (__NR_SYSCALL_BASE + 174)
@@ -156,6 +155,7 @@
#define __NR_timer_getoverrun (__NR_SYSCALL_BASE + 260)
#define __NR_timer_delete (__NR_SYSCALL_BASE + 261)
#define __NR_utimes (__NR_SYSCALL_BASE + 269)
+#define __NR_sigaction (__NR_SYSCALL_BASE + 67)
#define __NR_socket (__NR_SYSCALL_BASE + 281)
#define __NR_socketpair (__NR_SYSCALL_BASE + 288)
#define __NR_bind (__NR_SYSCALL_BASE + 282)
@@ -212,6 +212,7 @@
#define __NR_timer_getoverrun (__NR_SYSCALL_BASE + 262)
#define __NR_timer_delete (__NR_SYSCALL_BASE + 263)
#define __NR_utimes (__NR_SYSCALL_BASE + 271)
+#define __NR_sigaction (__NR_SYSCALL_BASE + 67)
#define __NR_socketcall (__NR_SYSCALL_BASE + 102)
#define __NR_ioprio_set (__NR_SYSCALL_BASE + 289)
#define __NR_ioprio_get (__NR_SYSCALL_BASE + 290)
@@ -253,6 +254,7 @@
#define __NR_timer_getoverrun (__NR_SYSCALL_BASE + 262)
#define __NR_timer_delete (__NR_SYSCALL_BASE + 263)
#define __NR_utimes (__NR_SYSCALL_BASE + 271)
+#define __NR_sigaction (__NR_SYSCALL_BASE + 67)
#define __NR_socketcall (__NR_SYSCALL_BASE + 102)
#define __NR_socketcall (__NR_SYSCALL_BASE + 102)
#define __NR_socketcall (__NR_SYSCALL_BASE + 102)
diff --git a/libc/include/sys/linux-unistd.h b/libc/include/sys/linux-unistd.h
index 116d047..b0e7822 100644
--- a/libc/include/sys/linux-unistd.h
+++ b/libc/include/sys/linux-unistd.h
@@ -142,6 +142,7 @@ int __rt_sigaction (int sig, const struct sigaction *act, struct si
int __rt_sigprocmask (int how, const sigset_t *set, sigset_t *oset, size_t sigsetsize);
int __rt_sigtimedwait (const sigset_t *set, struct siginfo_t *info, struct timespec_t *timeout, size_t sigset_size);
int sigpending (sigset_t *);
+int __sigaction (int, const struct sigaction *, struct sigaction *);
int socket (int, int, int);
int socketpair (int, int, int, int*);
int bind (int, struct sockaddr *, int);