commit 4abacac32dcdc433b83b819ab6e03b958bbfb31c
author Andrew Hsieh <andrewhsieh@google.com> Mon Nov 04 00:30:45 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 04 00:30:46 2013 +0000
tree f4fa643c696ed43f5f589af2a0e3eb92d68a9c12
parent 07bdc2b8e6980173ca9e8070803dcaad042e52c2
parent 61097c7e51372afa0fc012b7de60c39a7f3efce8

Merge "Fix prototype of poll"

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;