commit 61097c7e51372afa0fc012b7de60c39a7f3efce8
author Andrew Hsieh <andrewhsieh@google.com> Fri Nov 01 08:31:59 2013 +0800
committer Andrew Hsieh <andrewhsieh@google.com> Fri Nov 01 08:33:08 2013 +0800
tree a4e2a92ef7cfb079078b1b17b007b451e658a3eb
parent 55530bf38722d88132efeee41c3f4fbff5e08e08

Fix prototype of poll

from poll(struct pollfd *, nfds_t, long) to
poll(struct pollfd *, nfds_t, int)

See 11952073af22568bba0b661f7a9d4402c443a888
and ebfbb367fbba29e825e1cf2beb88800e05e9778f

Change-Id: Idba600d4b172404f0a1d5d715febcba8a495a770

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

diff --git a/ndk/platforms/android-3/include/poll.h b/ndk/platforms/android-3/include/poll.h
index 560be89..91068e4 100644
--- a/ndk/platforms/android-3/include/poll.h
+++ b/ndk/platforms/android-3/include/poll.h
@@ -35,8 +35,7 @@
 
 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
 

ndk/sources/android/libportable/arch-mips/poll.c

diff --git a/ndk/sources/android/libportable/arch-mips/poll.c b/ndk/sources/android/libportable/arch-mips/poll.c
index 854f251..54059dd 100644
--- a/ndk/sources/android/libportable/arch-mips/poll.c
+++ b/ndk/sources/android/libportable/arch-mips/poll.c
@@ -106,7 +106,7 @@
 
 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;