Module Name: src
Committed By: justin
Date: Sat Jan 17 19:34:50 UTC 2015
Modified Files:
src/lib/librumpclient: rumpclient.c
Log Message:
Modern Android SDK does not need special cases
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/lib/librumpclient/rumpclient.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpclient/rumpclient.c
diff -u src/lib/librumpclient/rumpclient.c:1.64 src/lib/librumpclient/rumpclient.c:1.65
--- src/lib/librumpclient/rumpclient.c:1.64 Sat Dec 13 17:18:55 2014
+++ src/lib/librumpclient/rumpclient.c Sat Jan 17 19:34:50 2015
@@ -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_socket)(int, int, int);
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);
