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

am 23b163fd: am e3a07da0: am 9dabc24f: am 4abacac3: Merge "Fix prototype of poll"

Browse Source 
* commit '23b163fdd8c6c7048c8ea57de717f6b551562a8e':
  Fix prototype of poll
This commit is contained in:
Andrew Hsieh
2014-01-09 21:35:52 +00:00
committed by Android Git Automerger
parent 026c467539 23b163fdd8
commit 8e23fbbdab
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;