[src/trunk]: src/lib Fix some snafus to allow rumphijack to work on -current.

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

details:   https://anonhg.NetBSD.org/src/rev/2d0c30a12c7b
branches:  trunk
changeset: 761683:2d0c30a12c7b
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sat Feb 05 12:38:19 2011 +0000

description:
Fix some snafus to allow rumphijack to work on -current.

reported by Alexander Nasonov

diffstat:

 lib/librumpclient/rumpclient.c |   6 +++++-
 lib/librumphijack/hijack.c     |  13 +++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (68 lines):

diff -r 55b5042e1232 -r 2d0c30a12c7b lib/librumpclient/rumpclient.c
--- a/lib/librumpclient/rumpclient.c    Sat Feb 05 06:42:44 2011 +0000
+++ b/lib/librumpclient/rumpclient.c    Sat Feb 05 12:38:19 2011 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: rumpclient.c,v 1.21 2011/01/28 19:21:28 pooka Exp $   */
+/*      $NetBSD: rumpclient.c,v 1.22 2011/02/05 12:38:19 pooka Exp $   */
 
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -709,7 +709,11 @@
        FINDSYM(sendto);
        FINDSYM(setsockopt);
        FINDSYM(kqueue);
+#if !__NetBSD_Prereq__(5,99,7)
        FINDSYM(kevent);
+#else
+       FINDSYM2(kevent,_sys___kevent50);
+#endif
 #undef FINDSYM
 #undef FINDSY2
 
diff -r 55b5042e1232 -r 2d0c30a12c7b lib/librumphijack/hijack.c
--- a/lib/librumphijack/hijack.c        Sat Feb 05 06:42:44 2011 +0000
+++ b/lib/librumphijack/hijack.c        Sat Feb 05 12:38:19 2011 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: hijack.c,v 1.23 2011/01/27 18:12:19 pooka Exp $       */
+/*      $NetBSD: hijack.c,v 1.24 2011/02/05 12:38:19 pooka Exp $       */
 
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: hijack.c,v 1.23 2011/01/27 18:12:19 pooka Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.24 2011/02/05 12:38:19 pooka Exp $");
 
 #define __ssp_weak_name(fun) _hijack_ ## fun
 
@@ -80,17 +80,14 @@
 #if !__NetBSD_Prereq__(5,99,7)
 #define LIBCSELECT select
 #define LIBCPOLLTS pollts
-#define LIBCPOLL poll
 #else
-#define LIBCSELECT __select50
-#define LIBCPOLLTS __pollts50
-#define LIBCPOLL __poll50
+#define LIBCSELECT _sys___select50
+#define LIBCPOLLTS _sys___pollts50
 #endif
 
 int LIBCSELECT(int, fd_set *, fd_set *, fd_set *, struct timeval *);
 int LIBCPOLLTS(struct pollfd *, nfds_t,
               const struct timespec *, const sigset_t *);
-int LIBCPOLL(struct pollfd *, nfds_t, int);
 
 #define S(a) __STRING(a)
 struct sysnames {
@@ -745,7 +742,7 @@
 }
 
 int
-LIBCPOLL(struct pollfd *fds, nfds_t nfds, int timeout)
+poll(struct pollfd *fds, nfds_t nfds, int timeout)
 {
        struct timespec ts;
        struct timespec *tsp = NULL;