diff --git a/ndk/platforms/android-3/include/poll.h b/ndk/platforms/android-3/include/poll.h
index 560be8979..91068e4ef 100644
--- 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
index 854f251cd..54059ddf5 100644
--- 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;