[src/trunk]: src/lib/librumpclient Modern Android SDK does not need special c...

[justin <justin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b653a44fc3ec
branches:  trunk
changeset: 805765:b653a44fc3ec
user:      justin <justin%NetBSD.org@localhost>
date:      Sat Jan 17 19:34:50 2015 +0000

description:
Modern Android SDK does not need special cases

diffstat:

 lib/librumpclient/rumpclient.c |  14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diffs (41 lines):

diff -r 72510ff0271a -r b653a44fc3ec lib/librumpclient/rumpclient.c
--- a/lib/librumpclient/rumpclient.c    Sat Jan 17 19:32:50 2015 +0000
+++ b/lib/librumpclient/rumpclient.c    Sat Jan 17 19:34:50 2015 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: rumpclient.c,v 1.64 2014/12/13 17:18:55 justin Exp $  */
+/*      $NetBSD: rumpclient.c,v 1.65 2015/01/17 19:34:50 justin Exp $  */
 
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -46,11 +46,11 @@
     defined(__DragonFly__) || defined(__OpenBSD__)
 #define USE_KQUEUE
 #endif
-#if defined(__linux__) && !defined(__ANDROID__)
+#if defined(__linux__)
 #define USE_SIGNALFD
 #endif
 
-__RCSID("$NetBSD: rumpclient.c,v 1.64 2014/12/13 17:18:55 justin Exp $");
+__RCSID("$NetBSD: rumpclient.c,v 1.65 2015/01/17 19:34:50 justin Exp $");
 
 #include <sys/param.h>
 #include <sys/mman.h>
@@ -86,17 +86,9 @@
 int    (*host_close)(int);
 int    (*host_connect)(int, const struct sockaddr *, socklen_t);
 int    (*host_fcntl)(int, int, ...);
-#ifdef __ANDROID__
-int    (*host_poll)(struct pollfd *, nfds_t, long);
-#else
 int    (*host_poll)(struct pollfd *, nfds_t, int);
-#endif
 ssize_t        (*host_read)(int, void *, size_t);
-#ifdef __ANDROID__
-int    (*host_sendmsg)(int, const struct msghdr *, unsigned int);
-#else
 ssize_t (*host_sendmsg)(int, const struct msghdr *, int);
-#endif
 int    (*host_setsockopt)(int, int, int, const void *, socklen_t);
 int    (*host_dup)(int);