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

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

Browse Source 
* commit '9dabc24f4117c6e57888b1202845fed8e03c8edb':
  Fix prototype of poll
This commit is contained in:
Andrew Hsieh
2013-11-03 16:58:19 -08:00
committed by Android Git Automerger
parent 5e90c1485a 9dabc24f41
commit e3a07da04d
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;
/* POSIX specifies "int" for the timeout, Linux seems to use long... */
extern int poll(struct pollfd *, nfds_t, long);
extern int poll(struct pollfd *, nfds_t, int);
__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);
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;
int ret;