diff options
author | raf <none@none> | 2008-01-23 12:00:31 -0800 |
---|---|---|
committer | raf <none@none> | 2008-01-23 12:00:31 -0800 |
commit | a574db851cdc636fc3939b68e80d79fe7fbd57f2 (patch) | |
tree | 7a28122042d1d24d9c4df92ba257e2d34d111e2e /usr/src/lib/libc/inc/mtlib.h | |
parent | 4a7ceb24cfcc0a97f96d86cfe5852ae445b50e57 (diff) | |
download | illumos-gate-a574db851cdc636fc3939b68e80d79fe7fbd57f2.tar.gz |
6598890 cancellation code abuses synonyms
--HG--
rename : usr/src/lib/libc/amd64/crt/cerror64.s => deleted_files/usr/src/lib/libc/amd64/crt/cerror64.s
rename : usr/src/lib/libc/port/gen/wait3.c => deleted_files/usr/src/lib/libc/port/gen/wait3.c
rename : usr/src/lib/libc/port/gen/wait4.c => deleted_files/usr/src/lib/libc/port/gen/wait4.c
rename : usr/src/lib/libc/port/sys/fsync.c => deleted_files/usr/src/lib/libc/port/sys/fsync.c
rename : usr/src/lib/libc/sparc/sys/syssun.s => deleted_files/usr/src/lib/libc/sparc/sys/syssun.s
rename : usr/src/lib/libc/common/sys/__fcntl.s => usr/src/lib/libc/common/sys/fcntl.s
rename : usr/src/lib/libc/common/sys/_rename.s => usr/src/lib/libc/common/sys/rename.s
rename : usr/src/lib/libc/port/gen/rename.c => usr/src/lib/libc/port/gen/remove.c
rename : usr/src/lib/libc/port/sys/fcntl.c => usr/src/lib/libc/port/sys/libc_fcntl.c
Diffstat (limited to 'usr/src/lib/libc/inc/mtlib.h')
-rw-r--r-- | usr/src/lib/libc/inc/mtlib.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/usr/src/lib/libc/inc/mtlib.h b/usr/src/lib/libc/inc/mtlib.h index 5d3fbf1451..c6dbdb1f3a 100644 --- a/usr/src/lib/libc/inc/mtlib.h +++ b/usr/src/lib/libc/inc/mtlib.h @@ -20,7 +20,7 @@ */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -42,9 +42,6 @@ extern int _private_mutex_destroy(mutex_t *); extern int _private_mutex_lock(mutex_t *); extern int _private_mutex_trylock(mutex_t *); extern int _private_mutex_unlock(mutex_t *); -#define rmutex_lock _private_mutex_lock -#define rmutex_trylock _private_mutex_trylock -#define rmutex_unlock _private_mutex_unlock extern void lmutex_lock(mutex_t *); extern void lmutex_unlock(mutex_t *); extern int __rwlock_init(rwlock_t *, int, void *); @@ -62,6 +59,10 @@ extern void sig_mutex_unlock(mutex_t *); extern int sig_mutex_trylock(mutex_t *); extern int sig_cond_wait(cond_t *, mutex_t *); extern int sig_cond_reltimedwait(cond_t *, mutex_t *, const timespec_t *); +extern void cancel_safe_mutex_lock(mutex_t *); +extern void cancel_safe_mutex_unlock(mutex_t *); +extern int cancel_safe_mutex_trylock(mutex_t *); +extern int cancel_active(void); /* the private libc thread-safe allocator */ extern void *lmalloc(size_t); @@ -81,9 +82,9 @@ extern int __mutex_unlock(mutex_t *); extern int _cond_init(cond_t *, int, void *); extern int _cond_destroy(cond_t *); -extern int _cond_wait(cond_t *, mutex_t *); -extern int _cond_timedwait(cond_t *, mutex_t *, const timespec_t *); -extern int _cond_reltimedwait(cond_t *, mutex_t *, const timespec_t *); +extern int __cond_wait(cond_t *, mutex_t *); +extern int __cond_timedwait(cond_t *, mutex_t *, const timespec_t *); +extern int __cond_reltimedwait(cond_t *, mutex_t *, const timespec_t *); extern int _cond_signal(cond_t *); extern int _cond_broadcast(cond_t *); |