summaryrefslogtreecommitdiff
path: root/lib/libpthread/pthread_misc.c
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2009-01-11 02:45:45 +0000
committerchristos <christos@NetBSD.org>2009-01-11 02:45:45 +0000
commit461a86f9bdbf4658bc4b37796e978427095f94a7 (patch)
treeeb340680ec500c8117744dbb3ea43074544ef572 /lib/libpthread/pthread_misc.c
parent6bbe77565e03756efac493ed9189b441a5eeffba (diff)
merge christos-time_t
Diffstat (limited to 'lib/libpthread/pthread_misc.c')
-rw-r--r--lib/libpthread/pthread_misc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libpthread/pthread_misc.c b/lib/libpthread/pthread_misc.c
index fc990106335..6f943a6ac5a 100644
--- a/lib/libpthread/pthread_misc.c
+++ b/lib/libpthread/pthread_misc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_misc.c,v 1.12 2008/12/29 15:08:04 christos Exp $ */
+/* $NetBSD: pthread_misc.c,v 1.13 2009/01/11 02:46:48 christos Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_misc.c,v 1.12 2008/12/29 15:08:04 christos Exp $");
+__RCSID("$NetBSD: pthread_misc.c,v 1.13 2009/01/11 02:46:48 christos Exp $");
#include <errno.h>
#include <string.h>
@@ -50,10 +50,10 @@ __RCSID("$NetBSD: pthread_misc.c,v 1.12 2008/12/29 15:08:04 christos Exp $");
int pthread__sched_yield(void);
int _sys___sigprocmask14(int, const sigset_t *, sigset_t *);
-int _sys_nanosleep(const struct timespec *, struct timespec *);
+int _sys___nanosleep50(const struct timespec *, struct timespec *);
int _sys_sched_yield(void);
+int __nanosleep50(const struct timespec *, struct timespec *);
-__strong_alias(_nanosleep, nanosleep)
__strong_alias(__libc_thr_sigsetmask,pthread_sigmask)
__strong_alias(__sigprocmask14,pthread_sigmask)
__strong_alias(__libc_thr_yield,pthread__sched_yield)
@@ -152,14 +152,14 @@ pthread_sigmask(int how, const sigset_t *set, sigset_t *oset)
#ifndef lint
int
-nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
+__nanosleep50(const struct timespec *rqtp, struct timespec *rmtp)
{
/*
* For now, just nanosleep. In the future, maybe pass a ucontext_t
* to _lwp_nanosleep() and allow it to recycle our kernel stack.
*/
- return _sys_nanosleep(rqtp, rmtp);
+ return _sys___nanosleep50(rqtp, rmtp);
}
#endif