Manual cleanup of remaining userland __P use (excluding packages maintained outside the tree)

1 files changed, 47 insertions, 55 deletions

diff --git a/lib/libpthread/include/pthread.h b/lib/libpthread/include/pthread.h
index c81cf953901..4a3f470c741 100644
--- a/lib/libpthread/include/pthread.h
+++ b/lib/libpthread/include/pthread.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pthread.h,v 1.15 2002/02/16 21:27:25 millert Exp $	*/
+/*	$OpenBSD: pthread.h,v 1.16 2002/02/17 19:42:24 millert Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
@@ -207,42 +207,39 @@ __BEGIN_DECLS
 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_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_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));
+void		pthread_cleanup_push(void (*routine)(void *),
+		    void *routine_arg);
 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,
-			int *pshared));
-int		pthread_condattr_setpshared __P((pthread_condattr_t *attr,
-			int pshared));
+int		pthread_condattr_getpshared(const pthread_condattr_t *attr,
+		    int *pshared);
+int		pthread_condattr_setpshared(pthread_condattr_t *attr,
+		    int pshared);
 #endif
 
 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_init(pthread_cond_t *, const pthread_condattr_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_timedwait(pthread_cond_t *,
+		    pthread_mutex_t *, const struct timespec * abstime);
 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_create(pthread_t *, const pthread_attr_t *,
+		    void *(*start_routine) (void *), 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_create(pthread_key_t *, void (*routine)(void *));
 int		pthread_key_delete(pthread_key_t);
 int		pthread_kill(struct pthread *, int);
 int		pthread_mutexattr_init(pthread_mutexattr_t *);
@@ -250,26 +247,24 @@ 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_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 __P((pthread_once_t *,
-			void (*) (void)));
+int		pthread_once(pthread_once_t *, void (*)(void));
 int		pthread_rwlock_destroy(pthread_rwlock_t *);
-int		pthread_rwlock_init __P((pthread_rwlock_t *,
-			const pthread_rwlockattr_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 __P((const pthread_rwlockattr_t *,
-			int *));
-int		pthread_rwlockattr_setpshared __P((pthread_rwlockattr_t *,
-			int));
+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 *);
@@ -285,51 +280,50 @@ 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
 
 #if defined(_POSIX_THREAD_PRIO_PROTECT)
-int		pthread_mutexattr_getprioceiling __P((pthread_mutexattr_t *,
-			int *prioceiling));
-int		pthread_mutexattr_setprioceiling __P((pthread_mutexattr_t *,
-			int prioceiling));
+int		pthread_mutexattr_getprioceiling(pthread_mutexattr_t *,
+		    int *prioceiling);
+int		pthread_mutexattr_setprioceiling(pthread_mutexattr_t *,
+		    int prioceiling);
 int		pthread_mutex_getprioceiling(pthread_mutex_t *, int *);
-int		pthread_mutex_setprioceiling __P((pthread_mutex_t *, int,
-			int *));
+int		pthread_mutex_setprioceiling(pthread_mutex_t *, int, int *);
 #endif
 
 #if defined(_POSIX_THREAD_PRIO_PROTECT) || defined (_POSIX_THREAD_PRIO_INHERIT)
-int		pthread_mutexattr_getprotocol __P((pthread_mutexattr_t *,
-			int *protocol));
-int		pthread_mutexattr_setprotocol __P((pthread_mutexattr_t *,
-			int protocol));
+int		pthread_mutexattr_getprotocol(pthread_mutexattr_t *,
+		    int *protocol);
+int		pthread_mutexattr_setprotocol(pthread_mutexattr_t *,
+		    int protocol);
 #endif
 
-int		pthread_getschedparam __P((pthread_t pthread, int *policy,
-			struct sched_param * param));
-int		pthread_setschedparam __P((pthread_t pthread, int policy,
-			const struct sched_param * param));
+int		pthread_getschedparam(pthread_t pthread, int *policy,
+		    struct sched_param * param);
+int		pthread_setschedparam(pthread_t pthread, int policy,
+		    const struct sched_param * param);
 
 #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
 int		pthread_attr_getinheritsched(const pthread_attr_t *, int *);
-int		pthread_attr_getschedparam __P((const pthread_attr_t *,
-			struct sched_param *));
+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 __P((pthread_attr_t *,
-			const struct sched_param *));
+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);
 #endif
 
 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 *));
+int		pthread_attr_setcleanup(pthread_attr_t *,
+		    void (*routine)(void *), void *);
 
 
 #ifdef notyet
@@ -339,10 +333,8 @@ int		pthread_attr_setcleanup __P((pthread_attr_t *,
 #define PTHREAD_PRIO_INHERIT
 #define PTHREAD_PRIO_NONE
 #define PTHREAD_PRIO_PROTECT
-int		pthread_attr_getguardsize __P((const pthread_attr_t *, 
-			size_t *));
-int		pthread_attr_setguardsize __P((const pthread_attr_t *, 
-			size_t));
+int		pthread_attr_getguardsize(const pthread_attr_t *, size_t *);
+int		pthread_attr_setguardsize(const pthread_attr_t *, size_t);
 int		pthread_getconcurrency(void);
 int		pthread_setconcurrency(int);
 #endif	/* susv2 */