From 300518c0a10b4f5030e23380da07c906a3ee80dc Mon Sep 17 00:00:00 2001 From: imp Date: Sat, 23 Mar 2002 17:24:55 +0000 Subject: Breath deep and take __P out of the system include files. # This appears to not break X11, but I'm having problems compiling the # glide part of the server with or without this patch, so I can't tell # for sure. --- include/pthread.h | 203 ++++++++++++++++++++++++++---------------------------- 1 file changed, 96 insertions(+), 107 deletions(-) (limited to 'include/pthread.h') diff --git a/include/pthread.h b/include/pthread.h index ec11d6f..c48654a 100644 --- a/include/pthread.h +++ b/include/pthread.h @@ -121,7 +121,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. @@ -189,124 +189,113 @@ enum pthread_mutextype { * Thread function prototype definitions: */ __BEGIN_DECLS -int pthread_attr_destroy __P((pthread_attr_t *)); -int pthread_attr_getstacksize __P((const pthread_attr_t *, - size_t *)); -int pthread_attr_getguardsize __P((const pthread_attr_t *, - size_t *)); -int pthread_attr_getstackaddr __P((const 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_setguardsize __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)); -void pthread_cleanup_push __P((void (*) (void *), - void *routine_arg)); -int pthread_condattr_destroy __P((pthread_condattr_t *)); -int pthread_condattr_init __P((pthread_condattr_t *)); +int pthread_attr_destroy(pthread_attr_t *); +int pthread_attr_getstacksize(const pthread_attr_t *, size_t *); +int pthread_attr_getguardsize(const pthread_attr_t *, size_t *); +int pthread_attr_getstackaddr(const pthread_attr_t *, void **); +int pthread_attr_getdetachstate(const pthread_attr_t *, int *); +int pthread_attr_init(pthread_attr_t *); +int pthread_attr_setstacksize(pthread_attr_t *, size_t); +int pthread_attr_setguardsize(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); +void pthread_cleanup_push(void (*) (void *), void *routine_arg); +int pthread_condattr_destroy(pthread_condattr_t *); +int pthread_condattr_init(pthread_condattr_t *); #if defined(_POSIX_THREAD_PROCESS_SHARED) -int pthread_condattr_getpshared __P((pthread_condattr_t *, - int *)); -int pthread_condattr_setpshared __P((pthread_condattr_t *, - int)); +int pthread_condattr_getpshared(pthread_condattr_t *, int *); +int pthread_condattr_setpshared(pthread_condattr_t *, int); #endif -int pthread_cond_broadcast __P((pthread_cond_t *)); -int pthread_cond_destroy __P((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_timedwait __P((pthread_cond_t *, - pthread_mutex_t *, const struct timespec *)); -int pthread_cond_wait __P((pthread_cond_t *, pthread_mutex_t *)); -int pthread_create __P((pthread_t *, const pthread_attr_t *, - void *(*) (void *), void *)); -int pthread_detach __P((pthread_t)); -int pthread_equal __P((pthread_t, pthread_t)); -void pthread_exit __P((void *)) __dead2; -void *pthread_getspecific __P((pthread_key_t)); -int pthread_join __P((pthread_t, void **)); -int pthread_key_create __P((pthread_key_t *, - void (*) (void *))); -int pthread_key_delete __P((pthread_key_t)); -int pthread_kill __P((pthread_t, 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_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_once __P((pthread_once_t *, - void (*) (void))); -int pthread_rwlock_destroy __P((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_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_cond_broadcast(pthread_cond_t *); +int pthread_cond_destroy(pthread_cond_t *); +int pthread_cond_init(pthread_cond_t *, + const pthread_condattr_t *); +int pthread_cond_signal(pthread_cond_t *); +int pthread_cond_timedwait(pthread_cond_t *, + pthread_mutex_t *, const struct timespec *); +int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *); +int pthread_create(pthread_t *, const pthread_attr_t *, + void *(*) (void *), void *); +int pthread_detach(pthread_t); +int pthread_equal(pthread_t, pthread_t); +void pthread_exit(void *) __dead2; +void *pthread_getspecific(pthread_key_t); +int pthread_join(pthread_t, void **); +int pthread_key_create(pthread_key_t *, + void (*) (void *)); +int pthread_key_delete(pthread_key_t); +int pthread_kill(pthread_t, 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(pthread_mutex_t *, + const pthread_mutexattr_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(pthread_once_t *, void (*) (void)); +int pthread_rwlock_destroy(pthread_rwlock_t *); +int pthread_rwlock_init(pthread_rwlock_t *, + const 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(const pthread_rwlockattr_t *, + int *); +int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int); +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 *, - int *pshared)); -int pthread_mutexattr_setpshared __P((pthread_mutexattr_t *, - int pshared)); +int pthread_mutexattr_getpshared(pthread_mutexattr_t *, + int *pshared); +int pthread_mutexattr_setpshared(pthread_mutexattr_t *, + int pshared); #endif -int pthread_mutexattr_getprioceiling __P((pthread_mutexattr_t *, - int *)); -int pthread_mutexattr_setprioceiling __P((pthread_mutexattr_t *, - int)); -int pthread_mutex_getprioceiling __P((pthread_mutex_t *, int *)); -int pthread_mutex_setprioceiling __P((pthread_mutex_t *, int, int *)); +int pthread_mutexattr_getprioceiling(pthread_mutexattr_t *, + int *); +int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *, + int); +int pthread_mutex_getprioceiling(pthread_mutex_t *, int *); +int pthread_mutex_setprioceiling(pthread_mutex_t *, int, int *); -int pthread_mutexattr_getprotocol __P((pthread_mutexattr_t *, - int *)); -int pthread_mutexattr_setprotocol __P((pthread_mutexattr_t *, - int)); +int pthread_mutexattr_getprotocol(pthread_mutexattr_t *, int *); +int pthread_mutexattr_setprotocol(pthread_mutexattr_t *, int); -int pthread_attr_getinheritsched __P((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_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_getschedparam __P((pthread_t pthread, int *, - struct sched_param *)); -int pthread_setschedparam __P((pthread_t, int, - const struct sched_param *)); +int pthread_attr_getinheritsched(const pthread_attr_t *, int *); +int pthread_attr_getschedparam(const pthread_attr_t *, + struct sched_param *); +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(pthread_attr_t *, + const struct sched_param *); +int pthread_attr_setschedpolicy(pthread_attr_t *, int); +int pthread_attr_setscope(pthread_attr_t *, int); +int pthread_getschedparam(pthread_t pthread, int *, + struct sched_param *); +int pthread_setschedparam(pthread_t, int, + const struct sched_param *); __END_DECLS #endif -- cgit v1.1