generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Removes wait3(2) from LP64."

Browse Source
This commit is contained in:
Dan Albert 2014-06-14 00:19:36 +00:00 committed by Gerrit Code Review
commit b725e7627f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libc/bionic/ndk_cruft.cpp
View File

@ -250,4 +250,9 @@ extern "C" int issetugid() {
return 0; return 0;
} }
// This was removed from POSIX 2004.
extern "C" pid_t wait3(int* status, int options, struct rusage* rusage) {
return wait4(-1, status, options, rusage);
}
#endif #endif

4
libc/bionic/wait.cpp
View File

@ -35,10 +35,6 @@ pid_t wait(int* status) {
return wait4(-1, status, 0, NULL); return wait4(-1, status, 0, NULL);
} }
pid_t wait3(int* status, int options, struct rusage* rusage) {
return wait4(-1, status, options, rusage);
}
pid_t waitpid(pid_t pid, int* status, int options) { pid_t waitpid(pid_t pid, int* status, int options) {
return wait4(pid, status, options, NULL); return wait4(pid, status, options, NULL);
} }

1
libc/include/sys/wait.h
View File

@ -47,7 +47,6 @@ __BEGIN_DECLS
extern pid_t wait(int *); extern pid_t wait(int *);
extern pid_t waitpid(pid_t, int *, int); extern pid_t waitpid(pid_t, int *, int);
extern pid_t wait3(int *, int, struct rusage *);
extern pid_t wait4(pid_t, int *, int, struct rusage *); extern pid_t wait4(pid_t, int *, int, struct rusage *);
/* Posix states that idtype_t should be an enumeration type, but /* Posix states that idtype_t should be an enumeration type, but