diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-29 15:38:55 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-29 15:38:55 -0800 |
| commit | 7c38f53d1911e04acf6398921a7bd4444d585c2b (patch) | |
| tree | 8956d2f496db464333e6a18c8c3775e4c78857b7 /libc | |
| parent | 17edd38f03300af28c89f9031dad177af8232c3a (diff) | |
| parent | 7f28e0b4501de7c4f8f627fd3e4be323d737ae82 (diff) | |
| download | android_bionic-7c38f53d1911e04acf6398921a7bd4444d585c2b.tar.gz android_bionic-7c38f53d1911e04acf6398921a7bd4444d585c2b.tar.bz2 android_bionic-7c38f53d1911e04acf6398921a7bd4444d585c2b.zip | |
am 7f28e0b4: Merge "Clean up the remnants of SuperH support"
* commit '7f28e0b4501de7c4f8f627fd3e4be323d737ae82':
Clean up the remnants of SuperH support
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/SYSCALLS.TXT | 4 | ||||
| -rw-r--r-- | libc/include/sys/linux-unistd.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT index 3190b126f..2da38b70b 100644 --- a/libc/SYSCALLS.TXT +++ b/libc/SYSCALLS.TXT @@ -190,7 +190,7 @@ int __timer_gettime:timer_gettime(timer_t, struct itimerspec*) int __timer_getoverrun:timer_getoverrun(timer_t) 260,262 int __timer_delete:timer_delete(timer_t) 261,263 int utimes(const char*, const struct timeval tvp[2]) 269, 271 -int utimensat(int, const char *, const struct timespec times[2], int) 348, 320, 320 +int utimensat(int, const char *, const struct timespec times[2], int) 348, 320 # signals int sigaction(int, const struct sigaction *, struct sigaction *) 67 @@ -229,7 +229,7 @@ int getpeername:socketcall:7(int, struct sockaddr *, socklen_t *) -1, int socketpair:socketcall:8(int, int, int, int*) -1,102 int sendto:socketcall:11(int, const void *, size_t, int, const struct sockaddr *, socklen_t) -1,102 int recvfrom:socketcall:12(int, void *, size_t, unsigned int, struct sockaddr *, socklen_t *) -1,102 -int shutdown:socketcall:13(int, int) -1,102,-1 +int shutdown:socketcall:13(int, int) -1,102 int setsockopt:socketcall:14(int, int, int, const void *, socklen_t) -1,102 int getsockopt:socketcall:15(int, int, int, void *, socklen_t *) -1,102 int sendmsg:socketcall:16(int, const struct msghdr *, unsigned int) -1,102 diff --git a/libc/include/sys/linux-unistd.h b/libc/include/sys/linux-unistd.h index 246d7fea5..d945d87b4 100644 --- a/libc/include/sys/linux-unistd.h +++ b/libc/include/sys/linux-unistd.h @@ -189,7 +189,6 @@ int setsockopt (int, int, int, const void *, socklen_t); int getsockopt (int, int, int, void *, socklen_t *); int sendmsg (int, const struct msghdr *, unsigned int); int recvmsg (int, struct msghdr *, unsigned int); -int __socketcall (int, unsigned long*); int sched_setscheduler (pid_t pid, int policy, const struct sched_param *param); int sched_getscheduler (pid_t pid); int sched_yield (void); |