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

Merge "Fix prototype of poll"

Browse Source
This commit is contained in:
Andrew Hsieh
2013-11-04 00:30:45 +00:00
committed by Gerrit Code Review
parent 07bdc2b8e6 61097c7e51
commit 4abacac32d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ndk/platforms/android-3/include/poll.h
View File

@@ -35,8 +35,7 @@ __BEGIN_DECLS
typedef unsigned int nfds_t; typedef unsigned int nfds_t;
/* POSIX specifies "int" for the timeout, Linux seems to use long... */ extern int poll(struct pollfd *, nfds_t, int);
extern int poll(struct pollfd *, nfds_t, long);
__END_DECLS __END_DECLS

2
ndk/sources/android/libportable/arch-mips/poll.c
View File

@@ -106,7 +106,7 @@ static inline short change_mips_events(short mips_events)
extern int poll(struct pollfd *, nfds_t, int); extern int poll(struct pollfd *, nfds_t, int);
int WRAP(poll)(struct pollfd *fds, nfds_t nfds, long timeout) int WRAP(poll)(struct pollfd *fds, nfds_t nfds, int timeout)
{ {
nfds_t i; nfds_t i;
int ret; int ret;