Module Name: src Committed By: pooka Date: Mon Feb 7 10:28:18 UTC 2011
Modified Files: src/lib/librumphijack: hijack.c Log Message: call the non-compat pollts() from inside the library To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/librumphijack/hijack.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/librumphijack/hijack.c diff -u src/lib/librumphijack/hijack.c:1.28 src/lib/librumphijack/hijack.c:1.29 --- src/lib/librumphijack/hijack.c:1.28 Sun Feb 6 15:48:20 2011 +++ src/lib/librumphijack/hijack.c Mon Feb 7 10:28:18 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hijack.c,v 1.28 2011/02/06 15:48:20 pooka Exp $ */ +/* $NetBSD: hijack.c,v 1.29 2011/02/07 10:28:18 pooka Exp $ */ /*- * Copyright (c) 2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: hijack.c,v 1.28 2011/02/06 15:48:20 pooka Exp $"); +__RCSID("$NetBSD: hijack.c,v 1.29 2011/02/07 10:28:18 pooka Exp $"); #define __ssp_weak_name(fun) _hijack_ ## fun @@ -79,15 +79,15 @@ * Also, this does not work for compat-using binaries! */ #if !__NetBSD_Prereq__(5,99,7) -#define LIBCSELECT select -#define LIBCPOLLTS pollts +#define REALSELECT select +#define REALPOLLTS pollts #else -#define LIBCSELECT _sys___select50 -#define LIBCPOLLTS _sys___pollts50 +#define REALSELECT _sys___select50 +#define REALPOLLTS _sys___pollts50 #endif -int LIBCSELECT(int, fd_set *, fd_set *, fd_set *, struct timeval *); -int LIBCPOLLTS(struct pollfd *, nfds_t, +int REALSELECT(int, fd_set *, fd_set *, fd_set *, struct timeval *); +int REALPOLLTS(struct pollfd *, nfds_t, const struct timespec *, const sigset_t *); #define S(a) __STRING(a) @@ -118,7 +118,7 @@ { DUALCALL_FCNTL, "fcntl", RSYS_NAME(FCNTL) }, { DUALCALL_DUP2, "dup2", RSYS_NAME(DUP2) }, { DUALCALL_CLOSE, "close", RSYS_NAME(CLOSE) }, - { DUALCALL_POLLTS, S(LIBCPOLLTS), RSYS_NAME(POLLTS) }, + { DUALCALL_POLLTS, S(REALPOLLTS), RSYS_NAME(POLLTS) }, }; #undef S @@ -481,7 +481,7 @@ * select is done by calling poll. */ int -LIBCSELECT(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, +REALSELECT(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout) { struct pollfd *pfds; @@ -549,7 +549,7 @@ TIMEVAL_TO_TIMESPEC(timeout, &ts); tsp = &ts; } - rv = pollts(pfds, realnfds, tsp, NULL); + rv = REALPOLLTS(pfds, realnfds, tsp, NULL); if (rv <= 0) goto out; @@ -647,7 +647,7 @@ } int -LIBCPOLLTS(struct pollfd *fds, nfds_t nfds, const struct timespec *ts, +REALPOLLTS(struct pollfd *fds, nfds_t nfds, const struct timespec *ts, const sigset_t *sigmask) { int (*op_pollts)(struct pollfd *, nfds_t, const struct timespec *, @@ -798,7 +798,7 @@ tsp = &ts; } - return pollts(fds, nfds, tsp, NULL); + return REALPOLLTS(fds, nfds, tsp, NULL); } int