diff options
| author | Elliott Hughes <enh@google.com> | 2012-04-16 14:16:42 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-04-16 14:16:42 -0700 |
| commit | 8ecb4770a0a046e753e16d51d31371b827d20cf1 (patch) | |
| tree | 29a924ee55909059732fe9903ec809695ddd951d /libc/SYSCALLS.TXT | |
| parent | 8266cf94d399e2bf9f787ac9d6a5ecbfb5af3f5d (diff) | |
| parent | 6b8fd05414decfbbe46c8ce8e45ab8384594805e (diff) | |
| download | bionic-8ecb4770a0a046e753e16d51d31371b827d20cf1.zip bionic-8ecb4770a0a046e753e16d51d31371b827d20cf1.tar.gz bionic-8ecb4770a0a046e753e16d51d31371b827d20cf1.tar.bz2 | |
resolved conflicts for merge of 6b8fd054 to master
Change-Id: Ifc5a10d9c2f7764ad80d64cc552aad81d5fbf5eb
Diffstat (limited to 'libc/SYSCALLS.TXT')
| -rw-r--r-- | libc/SYSCALLS.TXT | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT index a9bd4fd..5604582 100644 --- a/libc/SYSCALLS.TXT +++ b/libc/SYSCALLS.TXT @@ -47,8 +47,8 @@ uid_t getuid:getuid32 () 199 gid_t getgid:getgid32 () 200 uid_t geteuid:geteuid32 () 201 gid_t getegid:getegid32 () 202 -uid_t getresuid:getresuid32 () 209 -gid_t getresgid:getresgid32 () 211 +uid_t getresuid:getresuid32 (uid_t *ruid, uid_t *euid, uid_t *suid) 209 +gid_t getresgid:getresgid32 (gid_t *rgid, gid_t *egid, gid_t *sgid) 211 pid_t gettid() 224 ssize_t readahead(int, off64_t, size_t) 225 int getgroups:getgroups32(int, gid_t *) 205 |