From 61097c7e51372afa0fc012b7de60c39a7f3efce8 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Fri, 1 Nov 2013 08:31:59 +0800 Subject: [PATCH] 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 | 3 +-- ndk/sources/android/libportable/arch-mips/poll.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) 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;