Merge "Fix prototype of poll"

2013-11-04 00:30:45 +00:00
parent 07bdc2b8e6 61097c7e51
commit 4abacac32d
2 changed files with 2 additions and 3 deletions
--- 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;