LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 87d906b2: am 5f37cda9: Merge "ndk: <unistd.h>: minor cleanup"

Browse Source 
* commit '87d906b24376757b8b82d49698bb4731e3e9ad94':
  ndk: <unistd.h>: minor cleanup
This commit is contained in:
Andrew Hsieh
2012-04-02 07:58:09 -07:00
committed by Android Git Automerger
parent 60df0c2b83 87d906b243
commit d3d90fb611
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ndk/platforms/android-3/include/sys/prctl.h
View File

@@ -32,8 +32,13 @@
__BEGIN_DECLS __BEGIN_DECLS
extern int prctl(int option, unsigned long arg2, unsigned long arg3 , unsigned /* IMPORTANT NOTE: This function is declared as taking a variable number
long arg4, unsigned long arg5); * 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 __END_DECLS

7
ndk/platforms/android-3/include/unistd.h
View File

@@ -70,8 +70,9 @@ extern int execlp(const char *, const char *, ...);
extern int execle(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 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 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); extern int nice(int);
@@ -121,7 +122,7 @@ extern int sync(void);
extern int close(int); extern int close(int);
extern off_t lseek(int, off_t, int); extern off_t lseek(int, off_t, int);
extern loff_t lseek64(int, loff_t, int); extern off64_t lseek64(int, off64_t, int);
extern ssize_t read(int, void *, size_t); extern ssize_t read(int, void *, size_t);
extern ssize_t write(int, const void *, size_t); extern ssize_t write(int, const void *, size_t);

7
ndk/platforms/android-8/include/unistd.h
View File

@@ -70,8 +70,9 @@ extern int execlp(const char *, const char *, ...);
extern int execle(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 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 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); extern int nice(int);
@@ -125,7 +126,7 @@ extern int sync(void);
extern int close(int); extern int close(int);
extern off_t lseek(int, off_t, int); extern off_t lseek(int, off_t, int);
extern loff_t lseek64(int, loff_t, int); extern off64_t lseek64(int, off64_t, int);
extern ssize_t read(int, void *, size_t); extern ssize_t read(int, void *, size_t);
extern ssize_t write(int, const void *, size_t); extern ssize_t write(int, const void *, size_t);

7
ndk/platforms/android-9/include/unistd.h
View File

@@ -70,8 +70,9 @@ extern int execlp(const char *, const char *, ...);
extern int execle(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 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 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); extern int nice(int);
@@ -128,7 +129,7 @@ extern int sync(void);
extern int close(int); extern int close(int);
extern off_t lseek(int, off_t, int); extern off_t lseek(int, off_t, int);
extern loff_t lseek64(int, loff_t, int); extern off64_t lseek64(int, off64_t, int);
extern ssize_t read(int, void *, size_t); extern ssize_t read(int, void *, size_t);
extern ssize_t write(int, const void *, size_t); extern ssize_t write(int, const void *, size_t);