Merge "Fix prototype of poll"

Andrew Hsieh · Gerrit Code Review · commit 4abacac32dcd · 2013-11-04T00:30:46.000Z
diff --git a/ndk/platforms/android-3/include/poll.h b/ndk/platforms/android-3/include/poll.h
@@ -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
 
diff --git a/ndk/sources/android/libportable/arch-mips/poll.c b/ndk/sources/android/libportable/arch-mips/poll.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ static inline short change_mips_events(short mips_events)`
`106`	`106`
`107`	`107`	`extern int poll(struct pollfd *, nfds_t, int);`
`108`	`108`
`109`		`-int WRAP(poll)(struct pollfd *fds, nfds_t nfds, long timeout)`
	`109`	`+int WRAP(poll)(struct pollfd *fds, nfds_t nfds, int timeout)`
`110`	`110`	`{`
`111`	`111`	`nfds_t i;`
`112`	`112`	`int ret;`