Merge "Make all rt_sigtimedwait signatures match." am: c7e0ae064d

am: 38ba0203dd

* commit '38ba0203dd3b9067095de43192cdac5a8477dc2f':
  Make all rt_sigtimedwait signatures match.

Change-Id: Ic2be93191e911612ae57516995fcbbb91408206d
This commit is contained in:
Elliott Hughes 2016-05-23 19:31:12 +00:00 committed by android-build-merger
commit 92af86f6f6
3 changed files with 3 additions and 3 deletions

View file

@ -232,7 +232,7 @@ int __rt_sigaction:rt_sigaction(int, const struct sigaction*, struct sigacti
int __rt_sigpending:rt_sigpending(sigset_t*, size_t) all
int __rt_sigprocmask:rt_sigprocmask(int, const sigset_t*, sigset_t*, size_t) all
int __rt_sigsuspend:rt_sigsuspend(const sigset_t*, size_t) all
int __rt_sigtimedwait:rt_sigtimedwait(const sigset_t*, struct siginfo_t*, struct timespec_t*, size_t) all
int __rt_sigtimedwait:rt_sigtimedwait(const sigset_t*, siginfo_t*, const timespec*, size_t) all
int ___rt_sigqueueinfo:rt_sigqueueinfo(pid_t, int, siginfo_t*) all
int __signalfd4:signalfd4(int, const sigset_t*, size_t, int) all

View file

@ -37,7 +37,7 @@
#include <time.h>
// System calls.
extern "C" int __rt_sigtimedwait(const sigset_t*, siginfo_t*, const struct timespec*, size_t);
extern "C" int __rt_sigtimedwait(const sigset_t*, siginfo_t*, const timespec*, size_t);
extern "C" int __timer_create(clockid_t, sigevent*, __kernel_timer_t*);
extern "C" int __timer_delete(__kernel_timer_t);
extern "C" int __timer_getoverrun(__kernel_timer_t);

View file

@ -33,7 +33,7 @@
#include "private/kernel_sigset_t.h"
extern "C" int __rt_sigtimedwait(const sigset_t* uthese, siginfo_t* uinfo, const struct timespec* uts, size_t sigsetsize);
extern "C" int __rt_sigtimedwait(const sigset_t*, siginfo_t*, const timespec*, size_t);
int sigwait(const sigset_t* set, int* sig) {
kernel_sigset_t sigset(set);