Merge "Nullability check for wait module." am: e1df179f00
am: cea7551a27
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2539233 Change-Id: Ia8f48d9701a4eed83418091e02dde6ce3124eace Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
474b533f6a
1 changed files with 4 additions and 4 deletions
|
@ -37,9 +37,9 @@
|
||||||
|
|
||||||
__BEGIN_DECLS
|
__BEGIN_DECLS
|
||||||
|
|
||||||
pid_t wait(int* __status);
|
pid_t wait(int* _Nullable __status);
|
||||||
pid_t waitpid(pid_t __pid, int* __status, int __options);
|
pid_t waitpid(pid_t __pid, int* _Nullable __status, int __options);
|
||||||
pid_t wait4(pid_t __pid, int* __status, int __options, struct rusage* __rusage) __INTRODUCED_IN(18);
|
pid_t wait4(pid_t __pid, int* _Nullable __status, int __options, struct rusage* _Nullable __rusage) __INTRODUCED_IN(18);
|
||||||
|
|
||||||
/* Posix states that idtype_t should be an enumeration type, but
|
/* Posix states that idtype_t should be an enumeration type, but
|
||||||
* the kernel headers define P_ALL, P_PID and P_PGID as constant macros
|
* the kernel headers define P_ALL, P_PID and P_PGID as constant macros
|
||||||
|
@ -47,6 +47,6 @@ pid_t wait4(pid_t __pid, int* __status, int __options, struct rusage* __rusage)
|
||||||
*/
|
*/
|
||||||
typedef int idtype_t;
|
typedef int idtype_t;
|
||||||
|
|
||||||
int waitid(idtype_t __type, id_t __id, siginfo_t* __info, int __options);
|
int waitid(idtype_t __type, id_t __id, siginfo_t* _Nullable __info, int __options);
|
||||||
|
|
||||||
__END_DECLS
|
__END_DECLS
|
||||||
|
|
Loading…
Reference in a new issue