am 4aa32153: am 2cae7967: Merge "libc: Fix prctl() declaration."

* commit '4aa321538afde20a632ed666f83f40f892505550':
  libc: Fix prctl() declaration.
This commit is contained in:
David 'Digit' Turner
2011-06-07 10:49:32 -07:00
committed by Android Git Automerger
3 changed files with 12 additions and 4 deletions

View File

@@ -32,8 +32,13 @@
__BEGIN_DECLS
extern int prctl(int option, unsigned long arg2, unsigned long arg3 , unsigned
long arg4, unsigned long arg5);
/* IMPORTANT NOTE: This function is declared as taking a variable number
* of arguments to match the GLibc definition. However
* its declaration inside SYSCALLS.TXT *must* make it
* take 6 arguments to ensure consistency with the kernel
* implementation.
*/
extern int prctl(int option, ...);
__END_DECLS

View File

@@ -70,8 +70,9 @@ extern int execlp(const char *, const char *, ...);
extern int execle(const char *, const char *, ...);
extern int capget(cap_user_header_t hdrp, cap_user_data_t datap);
extern int capset(cap_user_header_t hdrp, const cap_user_data_t datap);
extern int prctl(int option, unsigned long arg2, unsigned long arg3,
unsigned long arg4, unsigned long arg5);
/* IMPORTANT: See comment under <sys/prctl.h> about this declaration */
extern int prctl(int option, ...);
extern int nice(int);