diff options
Diffstat (limited to 'lib/libc_r/include')
| -rw-r--r-- | lib/libc_r/include/pthread.h | 120 | ||||
| -rw-r--r-- | lib/libc_r/include/pthread_np.h | 26 | ||||
| -rw-r--r-- | lib/libc_r/include/sched.h | 18 | ||||
| -rw-r--r-- | lib/libc_r/include/semaphore.h | 20 | ||||
| -rw-r--r-- | lib/libc_r/include/spinlock.h | 12 |
5 files changed, 98 insertions, 98 deletions
diff --git a/lib/libc_r/include/pthread.h b/lib/libc_r/include/pthread.h index 16224681331..c81cf953901 100644 --- a/lib/libc_r/include/pthread.h +++ b/lib/libc_r/include/pthread.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pthread.h,v 1.14 2002/01/10 00:45:30 fgsch Exp $ */ +/* $OpenBSD: pthread.h,v 1.15 2002/02/16 21:27:25 millert Exp $ */ /* * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu @@ -143,7 +143,7 @@ typedef struct pthread_rwlockattr *pthread_rwlockattr_t; * use in header symbols. */ typedef void *pthread_addr_t; -typedef void *(*pthread_startroutine_t) __P((void *)); +typedef void *(*pthread_startroutine_t)(void *); /* * Once definitions. @@ -204,20 +204,20 @@ enum pthread_mutextype { * Thread function prototype definitions: */ __BEGIN_DECLS -int pthread_attr_destroy __P((pthread_attr_t *)); -int pthread_attr_getstacksize __P((pthread_attr_t *, size_t *)); -int pthread_attr_getstackaddr __P((pthread_attr_t *, void **)); +int pthread_attr_destroy(pthread_attr_t *); +int pthread_attr_getstacksize(pthread_attr_t *, size_t *); +int pthread_attr_getstackaddr(pthread_attr_t *, void **); int pthread_attr_getdetachstate __P((const pthread_attr_t *, int *)); -int pthread_attr_init __P((pthread_attr_t *)); -int pthread_attr_setstacksize __P((pthread_attr_t *, size_t)); -int pthread_attr_setstackaddr __P((pthread_attr_t *, void *)); -int pthread_attr_setdetachstate __P((pthread_attr_t *, int)); -void pthread_cleanup_pop __P((int execute)); +int pthread_attr_init(pthread_attr_t *); +int pthread_attr_setstacksize(pthread_attr_t *, size_t); +int pthread_attr_setstackaddr(pthread_attr_t *, void *); +int pthread_attr_setdetachstate(pthread_attr_t *, int); +void pthread_cleanup_pop(int execute); void pthread_cleanup_push __P((void (*routine) (void *), void *routine_arg)); -int pthread_condattr_destroy __P((pthread_condattr_t *attr)); -int pthread_condattr_init __P((pthread_condattr_t *attr)); +int pthread_condattr_destroy(pthread_condattr_t *attr); +int pthread_condattr_init(pthread_condattr_t *attr); #if defined(_POSIX_THREAD_PROCESS_SHARED) int pthread_condattr_getpshared __P((const pthread_condattr_t *attr, @@ -226,63 +226,63 @@ int pthread_condattr_setpshared __P((pthread_condattr_t *attr, int pshared)); #endif -int pthread_cond_broadcast __P((pthread_cond_t *)); -int pthread_cond_destroy __P((pthread_cond_t *)); +int pthread_cond_broadcast(pthread_cond_t *); +int pthread_cond_destroy(pthread_cond_t *); int pthread_cond_init __P((pthread_cond_t *, const pthread_condattr_t *)); -int pthread_cond_signal __P((pthread_cond_t *)); +int pthread_cond_signal(pthread_cond_t *); int pthread_cond_timedwait __P((pthread_cond_t *, pthread_mutex_t *, const struct timespec * abstime)); -int pthread_cond_wait __P((pthread_cond_t *, pthread_mutex_t *)); +int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *); int pthread_create __P((pthread_t *, const pthread_attr_t *, void *(*start_routine) (void *), void *)); -int pthread_detach __P((pthread_t)); -int pthread_equal __P((pthread_t, pthread_t)); -__dead void pthread_exit __P((void *)) __attribute__((__noreturn__)); -void *pthread_getspecific __P((pthread_key_t)); -int pthread_join __P((pthread_t, void **)); +int pthread_detach(pthread_t); +int pthread_equal(pthread_t, pthread_t); +__dead void pthread_exit(void *) __attribute__((__noreturn__)); +void *pthread_getspecific(pthread_key_t); +int pthread_join(pthread_t, void **); int pthread_key_create __P((pthread_key_t *, void (*routine) (void *))); -int pthread_key_delete __P((pthread_key_t)); -int pthread_kill __P((struct pthread *, int)); -int pthread_mutexattr_init __P((pthread_mutexattr_t *)); -int pthread_mutexattr_destroy __P((pthread_mutexattr_t *)); -int pthread_mutexattr_gettype __P((pthread_mutexattr_t *, int *)); -int pthread_mutexattr_settype __P((pthread_mutexattr_t *, int)); -int pthread_mutex_destroy __P((pthread_mutex_t *)); +int pthread_key_delete(pthread_key_t); +int pthread_kill(struct pthread *, int); +int pthread_mutexattr_init(pthread_mutexattr_t *); +int pthread_mutexattr_destroy(pthread_mutexattr_t *); +int pthread_mutexattr_gettype(pthread_mutexattr_t *, int *); +int pthread_mutexattr_settype(pthread_mutexattr_t *, int); +int pthread_mutex_destroy(pthread_mutex_t *); int pthread_mutex_init __P((pthread_mutex_t *, const pthread_mutexattr_t *)); -int pthread_mutex_lock __P((pthread_mutex_t *)); -int pthread_mutex_trylock __P((pthread_mutex_t *)); -int pthread_mutex_unlock __P((pthread_mutex_t *)); +int pthread_mutex_lock(pthread_mutex_t *); +int pthread_mutex_trylock(pthread_mutex_t *); +int pthread_mutex_unlock(pthread_mutex_t *); int pthread_once __P((pthread_once_t *, void (*) (void))); -int pthread_rwlock_destroy __P((pthread_rwlock_t *)); +int pthread_rwlock_destroy(pthread_rwlock_t *); int pthread_rwlock_init __P((pthread_rwlock_t *, const pthread_rwlockattr_t *)); -int pthread_rwlock_rdlock __P((pthread_rwlock_t *)); -int pthread_rwlock_tryrdlock __P((pthread_rwlock_t *)); -int pthread_rwlock_trywrlock __P((pthread_rwlock_t *)); -int pthread_rwlock_unlock __P((pthread_rwlock_t *)); -int pthread_rwlock_wrlock __P((pthread_rwlock_t *)); -int pthread_rwlockattr_init __P((pthread_rwlockattr_t *)); +int pthread_rwlock_rdlock(pthread_rwlock_t *); +int pthread_rwlock_tryrdlock(pthread_rwlock_t *); +int pthread_rwlock_trywrlock(pthread_rwlock_t *); +int pthread_rwlock_unlock(pthread_rwlock_t *); +int pthread_rwlock_wrlock(pthread_rwlock_t *); +int pthread_rwlockattr_init(pthread_rwlockattr_t *); int pthread_rwlockattr_getpshared __P((const pthread_rwlockattr_t *, int *)); int pthread_rwlockattr_setpshared __P((pthread_rwlockattr_t *, int)); -int pthread_rwlockattr_destroy __P((pthread_rwlockattr_t *)); -pthread_t pthread_self __P((void)); -int pthread_setspecific __P((pthread_key_t, const void *)); -int pthread_sigmask __P((int, const sigset_t *, sigset_t *)); +int pthread_rwlockattr_destroy(pthread_rwlockattr_t *); +pthread_t pthread_self(void); +int pthread_setspecific(pthread_key_t, const void *); +int pthread_sigmask(int, const sigset_t *, sigset_t *); -int pthread_cancel __P((pthread_t)); -int pthread_setcancelstate __P((int, int *)); -int pthread_setcanceltype __P((int, int *)); -void pthread_testcancel __P((void)); +int pthread_cancel(pthread_t); +int pthread_setcancelstate(int, int *); +int pthread_setcanceltype(int, int *); +void pthread_testcancel(void); -int pthread_getprio __P((pthread_t)); -int pthread_setprio __P((pthread_t, int)); -void pthread_yield __P((void)); +int pthread_getprio(pthread_t); +int pthread_setprio(pthread_t, int); +void pthread_yield(void); #if defined(_POSIX_THREAD_PROCESS_SHARED) int pthread_mutexattr_getpshared __P((pthread_mutexattr_t *, @@ -296,7 +296,7 @@ int pthread_mutexattr_getprioceiling __P((pthread_mutexattr_t *, int *prioceiling)); int pthread_mutexattr_setprioceiling __P((pthread_mutexattr_t *, int prioceiling)); -int pthread_mutex_getprioceiling __P((pthread_mutex_t *, int *)); +int pthread_mutex_getprioceiling(pthread_mutex_t *, int *); int pthread_mutex_setprioceiling __P((pthread_mutex_t *, int, int *)); #endif @@ -314,20 +314,20 @@ int pthread_setschedparam __P((pthread_t pthread, int policy, const struct sched_param * param)); #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) -int pthread_attr_getinheritsched __P((const pthread_attr_t *, int *)); +int pthread_attr_getinheritsched(const pthread_attr_t *, int *); int pthread_attr_getschedparam __P((const pthread_attr_t *, struct sched_param *)); -int pthread_attr_getschedpolicy __P((const pthread_attr_t *, int *)); -int pthread_attr_getscope __P((const pthread_attr_t *, int *)); -int pthread_attr_setinheritsched __P((pthread_attr_t *, int)); +int pthread_attr_getschedpolicy(const pthread_attr_t *, int *); +int pthread_attr_getscope(const pthread_attr_t *, int *); +int pthread_attr_setinheritsched(pthread_attr_t *, int); int pthread_attr_setschedparam __P((pthread_attr_t *, const struct sched_param *)); -int pthread_attr_setschedpolicy __P((pthread_attr_t *, int)); -int pthread_attr_setscope __P((pthread_attr_t *, int)); +int pthread_attr_setschedpolicy(pthread_attr_t *, int); +int pthread_attr_setscope(pthread_attr_t *, int); #endif -int pthread_attr_setfloatstate __P((pthread_attr_t *, int)); -int pthread_attr_getfloatstate __P((pthread_attr_t *, int *)); +int pthread_attr_setfloatstate(pthread_attr_t *, int); +int pthread_attr_getfloatstate(pthread_attr_t *, int *); int pthread_attr_setcleanup __P((pthread_attr_t *, void (*routine) (void *), void *)); @@ -343,8 +343,8 @@ int pthread_attr_getguardsize __P((const pthread_attr_t *, size_t *)); int pthread_attr_setguardsize __P((const pthread_attr_t *, size_t)); -int pthread_getconcurrency __P((void)); -int pthread_setconcurrency __P((int)); +int pthread_getconcurrency(void); +int pthread_setconcurrency(int); #endif /* susv2 */ __END_DECLS diff --git a/lib/libc_r/include/pthread_np.h b/lib/libc_r/include/pthread_np.h index 014b0f7c67b..a7eded4b025 100644 --- a/lib/libc_r/include/pthread_np.h +++ b/lib/libc_r/include/pthread_np.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pthread_np.h,v 1.4 2001/08/17 22:44:15 pvalchev Exp $ */ +/* $OpenBSD: pthread_np.h,v 1.5 2002/02/16 21:27:25 millert Exp $ */ /* * Copyright (c) 1996-98 John Birrell <jb@cimlogic.com.au>. * All rights reserved. @@ -37,23 +37,23 @@ /* * Non-POSIX type definitions: */ -typedef void (*pthread_switch_routine_t) __P((pthread_t, pthread_t)); +typedef void (*pthread_switch_routine_t)(pthread_t, pthread_t); /* * Non-POSIX thread function prototype definitions: */ __BEGIN_DECLS -int pthread_attr_setcreatesuspend_np __P((pthread_attr_t *)); -int pthread_multi_np __P((void)); -int pthread_resume_np __P((pthread_t)); -int pthread_single_np __P((void)); -int pthread_suspend_np __P((pthread_t)); -int pthread_mutexattr_getkind_np __P((pthread_mutexattr_t)); -int pthread_mutexattr_setkind_np __P((pthread_mutexattr_t *, int)); -void pthread_set_name_np __P((pthread_t, char *)); -int pthread_switch_add_np __P((pthread_switch_routine_t)); -int pthread_switch_delete_np __P((pthread_switch_routine_t)); -int pthread_main_np __P((void)); +int pthread_attr_setcreatesuspend_np(pthread_attr_t *); +int pthread_multi_np(void); +int pthread_resume_np(pthread_t); +int pthread_single_np(void); +int pthread_suspend_np(pthread_t); +int pthread_mutexattr_getkind_np(pthread_mutexattr_t); +int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int); +void pthread_set_name_np(pthread_t, char *); +int pthread_switch_add_np(pthread_switch_routine_t); +int pthread_switch_delete_np(pthread_switch_routine_t); +int pthread_main_np(void); __END_DECLS #endif diff --git a/lib/libc_r/include/sched.h b/lib/libc_r/include/sched.h index 898d4ae6b16..81b91b2a682 100644 --- a/lib/libc_r/include/sched.h +++ b/lib/libc_r/include/sched.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sched.h,v 1.5 2002/01/18 00:38:12 fgsch Exp $ */ +/* $OpenBSD: sched.h,v 1.6 2002/02/16 21:27:25 millert Exp $ */ /* sched.h: POSIX 1003.1b Process Scheduling header */ @@ -60,17 +60,17 @@ struct sched_param #include <sys/cdefs.h> __BEGIN_DECLS -int sched_setparam __P((pid_t, const struct sched_param *)); -int sched_getparam __P((pid_t, struct sched_param *)); +int sched_setparam(pid_t, const struct sched_param *); +int sched_getparam(pid_t, struct sched_param *); -int sched_setscheduler __P((pid_t, int, const struct sched_param *)); -int sched_getscheduler __P((pid_t)); +int sched_setscheduler(pid_t, int, const struct sched_param *); +int sched_getscheduler(pid_t); -int sched_yield __P((void)); -int sched_get_priority_max __P((int)); -int sched_get_priority_min __P((int)); +int sched_yield(void); +int sched_get_priority_max(int); +int sched_get_priority_min(int); struct timespec; -int sched_rr_get_interval __P((pid_t, struct timespec *)); +int sched_rr_get_interval(pid_t, struct timespec *); __END_DECLS #endif /* KERNEL */ diff --git a/lib/libc_r/include/semaphore.h b/lib/libc_r/include/semaphore.h index eab8e356121..4735f9c29f9 100644 --- a/lib/libc_r/include/semaphore.h +++ b/lib/libc_r/include/semaphore.h @@ -1,4 +1,4 @@ -/* $OpenBSD: semaphore.h,v 1.2 2002/01/18 20:36:25 fgsch Exp $ */ +/* $OpenBSD: semaphore.h,v 1.3 2002/02/16 21:27:25 millert Exp $ */ /* semaphore.h: POSIX 1003.1b semaphores */ @@ -52,15 +52,15 @@ typedef struct sem *sem_t; #include <sys/cdefs.h> __BEGIN_DECLS -int sem_init __P((sem_t *, int, unsigned int)); -int sem_destroy __P((sem_t *)); -sem_t *sem_open __P((const char *, int, ...)); -int sem_close __P((sem_t *)); -int sem_unlink __P((const char *)); -int sem_wait __P((sem_t *)); -int sem_trywait __P((sem_t *)); -int sem_post __P((sem_t *)); -int sem_getvalue __P((sem_t *, int *)); +int sem_init(sem_t *, int, unsigned int); +int sem_destroy(sem_t *); +sem_t *sem_open(const char *, int, ...); +int sem_close(sem_t *); +int sem_unlink(const char *); +int sem_wait(sem_t *); +int sem_trywait(sem_t *); +int sem_post(sem_t *); +int sem_getvalue(sem_t *, int *); __END_DECLS #endif /* _KERNEL */ diff --git a/lib/libc_r/include/spinlock.h b/lib/libc_r/include/spinlock.h index 51dc5fba4de..8c87e963de1 100644 --- a/lib/libc_r/include/spinlock.h +++ b/lib/libc_r/include/spinlock.h @@ -29,8 +29,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: spinlock.h,v 1.6 2001/09/04 22:17:45 fgsch Exp $ - * $OpenBSD: spinlock.h,v 1.6 2001/09/04 22:17:45 fgsch Exp $ + * $Id: spinlock.h,v 1.7 2002/02/16 21:27:25 millert Exp $ + * $OpenBSD: spinlock.h,v 1.7 2002/02/16 21:27:25 millert Exp $ * * Lock definitions used in both libc and libpthread. * @@ -67,13 +67,13 @@ typedef volatile struct { * Thread function prototype definitions: */ __BEGIN_DECLS -void _spinlock __P((spinlock_t *)); -void _spinlock_debug __P((spinlock_t *, char *, int)); +void _spinlock(spinlock_t *); +void _spinlock_debug(spinlock_t *, char *, int); /* lock() functions return 0 if lock was acquired. */ /* is_locked functions() return 1 if lock is locked. */ -int _atomic_lock __P((volatile _spinlock_lock_t *)); -int _atomic_is_locked __P((volatile _spinlock_lock_t *)); +int _atomic_lock(volatile _spinlock_lock_t *); +int _atomic_is_locked(volatile _spinlock_lock_t *); __END_DECLS #endif /* _SPINLOCK_H_ */ |