OSSP CVS Repository

Check-in Number:	2631
Date:	2002-Oct-20 18:22:03 (local) 2002-Oct-20 16:22:03 (UTC)
User:	rse
Branch:
Comment:	Added "hard syscall mapping" support for using SYS___sigprocmask14 instead of SYS_sigprocmask on NetBSD. Submitted by: Nick Hudson <skrll@netbsd.org>
Tickets:
Inspections:
Files:	ossp-pkg/pth/ChangeLog      1.574 -> 1.575     4 inserted, 0 deleted ossp-pkg/pth/pth_syscall.c      1.24 -> 1.25     6 inserted, 4 deleted

---

ossp-pkg/pth/ChangeLog 1.574 -> 1.575

--- ChangeLog 2002/10/20 16:19:39 1.574 +++ ChangeLog 2002/10/20 16:22:03 1.575 @@ -21,6 +21,10 @@ Changes between 1.4.1 and 1.5.0 (27-Jan-2002 to xx-Oct-2002) + *) Added "hard syscall mapping" support for using + SYS___sigprocmask14 instead of SYS_sigprocmask on NetBSD. + [Nick Hudson <skrll@netbsd.org>] + *) Changes three direct sigprocmask(2) calls with the corresponding "hard syscall mapping" macro calls. [Nick Hudson <skrll@netbsd.org>]

---

ossp-pkg/pth/pth_syscall.c 1.24 -> 1.25

--- pth_syscall.c 2002/10/20 12:12:21 1.24 +++ pth_syscall.c 2002/10/20 16:22:03 1.25 @@ -278,7 +278,9 @@ return ((int (*)(int, const sigset_t *, sigset_t *)) pth_syscall_fct_tab[PTH_SCF_sigprocmask].addr) (how, set, oset); -#if defined(HAVE_SYSCALL) && defined(SYS_sigprocmask) +#if defined(HAVE_SYSCALL) && defined(SYS___sigprocmask14) /* NetBSD */ + else return (int)syscall(SYS___sigprocmask14, how, set, oset); +#elif defined(HAVE_SYSCALL) && defined(SYS_sigprocmask) else return (int)syscall(SYS_sigprocmask, how, set, oset); #else else PTH_SYSCALL_ERROR(-1, ENOSYS, "sigprocmask"); @@ -332,7 +334,7 @@ (s, addr, addrlen); #if defined(HAVE_SYSCALL) && defined(SYS_connect) else return (int)syscall(SYS_connect, s, addr, addrlen); -#elif defined(HAVE_SYSCALL) && defined(SYS_socketcall) && defined(SOCKOP_connect) +#elif defined(HAVE_SYSCALL) && defined(SYS_socketcall) && defined(SOCKOP_connect) /* Linux */ else { unsigned long args[3]; args[0] = (unsigned long)s; @@ -361,7 +363,7 @@ (s, addr, addrlen); #if defined(HAVE_SYSCALL) && defined(SYS_accept) else return (int)syscall(SYS_accept, s, addr, addrlen); -#elif defined(HAVE_SYSCALL) && defined(SYS_socketcall) && defined(SOCKOP_accept) +#elif defined(HAVE_SYSCALL) && defined(SYS_socketcall) && defined(SOCKOP_accept) /* Linux */ else { unsigned long args[3]; args[0] = (unsigned long)s; @@ -390,7 +392,7 @@ return ((int (*)(int, fd_set *, fd_set *, fd_set *, struct timeval *)) pth_syscall_fct_tab[PTH_SCF_select].addr) (nfds, readfds, writefds, exceptfds, timeout); -#if defined(HAVE_SYSCALL) && defined(SYS__newselect) +#if defined(HAVE_SYSCALL) && defined(SYS__newselect) /* Linux */ else return (int)syscall(SYS__newselect, nfds, readfds, writefds, exceptfds, timeout); #elif defined(HAVE_SYSCALL) && defined(SYS_select) else return (int)syscall(SYS_select, nfds, readfds, writefds, exceptfds, timeout);