Loading...
--- Libc/Libc-498/pthreads/pthread.h
+++ Libc/Libc-391/pthreads/pthread.h
@@ -2,14 +2,14 @@
* Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
- *
+ *
* This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
* Version 2.0 (the 'License'). You may not use this file except in
* compliance with the License. Please obtain a copy of the License at
* http://www.opensource.apple.com/apsl/ and read it before using this
* file.
- *
+ *
* The Original Code and all software distributed under the License are
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -17,29 +17,29 @@
* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
* Please see the License for the specific language governing rights and
* limitations under the License.
- *
+ *
* @APPLE_LICENSE_HEADER_END@
*/
/*
- * Copyright 1996 1995 by Open Software Foundation, Inc. 1997 1996 1995 1994 1993 1992 1991
- * All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies and
- * that both the copyright notice and this permission notice appear in
- * supporting documentation.
- *
- * OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
- * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
+ * Copyright 1996 1995 by Open Software Foundation, Inc. 1997 1996 1995 1994 1993 1992 1991
+ * All Rights Reserved
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright notice appears in all copies and
+ * that both the copyright notice and this permission notice appear in
+ * supporting documentation.
+ *
+ * OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
+ * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
*/
/*
* MkLinux
@@ -49,8 +49,8 @@
* POSIX Threads - IEEE 1003.1c
*/
-#ifndef _PTHREAD_H
-#define _PTHREAD_H
+#ifndef _POSIX_PTHREAD_H
+#define _POSIX_PTHREAD_H
#include <_types.h>
#ifndef __POSIX_LIB__
@@ -109,7 +109,7 @@
typedef __darwin_pthread_t pthread_t;
#endif
-#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || defined(_DARWIN_C_SOURCE)
+#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
#ifndef _MACH_PORT_T
#define _MACH_PORT_T
@@ -121,13 +121,13 @@
typedef __darwin_sigset_t sigset_t;
#endif
-#endif /* (!_POSIX_C_SOURCE && !_XOPEN_SOURCE) || _DARWIN_C_SOURCE */
+#endif /* ! _POSIX_C_SOURCE && ! _XOPEN_SOURCE */
/*
* These symbols indicate which [optional] features are available
* They can be tested at compile time via '#ifdef XXX'
* The way to check for pthreads is like so:
-
+
* #include <unistd.h>
* #ifdef _POSIX_THREADS
* #include <pthread.h>
@@ -208,15 +208,10 @@
* Mutex type attributes
*/
#define PTHREAD_MUTEX_NORMAL 0
-#define PTHREAD_MUTEX_ERRORCHECK 1
+#define PTHREAD_MUTEX_ERRORCHECK 1
#define PTHREAD_MUTEX_RECURSIVE 2
#define PTHREAD_MUTEX_DEFAULT PTHREAD_MUTEX_NORMAL
/*
- * RWLock variables
- */
-
-#define PTHREAD_RWLOCK_INITIALIZER {_PTHREAD_RWLOCK_SIG_init, {0}}
-/*
* Mutex variables
*/
@@ -241,234 +236,136 @@
/*
* Prototypes for all PTHREAD interfaces
*/
-int pthread_atfork(void (*)(void), void (*)(void),
- void (*)(void));
-int pthread_attr_destroy(pthread_attr_t *);
-int pthread_attr_getdetachstate(const pthread_attr_t *,
- int *);
-int pthread_attr_getguardsize(const pthread_attr_t * __restrict,
- size_t * __restrict);
-int pthread_attr_getinheritsched(const pthread_attr_t * __restrict,
- int * __restrict);
-int pthread_attr_getschedparam(const pthread_attr_t * __restrict,
- struct sched_param * __restrict);
-int pthread_attr_getschedpolicy(const pthread_attr_t * __restrict,
- int * __restrict);
-int pthread_attr_getscope(const pthread_attr_t * __restrict, int * __restrict);
-int pthread_attr_getstack(const pthread_attr_t * __restrict,
- void ** __restrict, size_t * __restrict);
-int pthread_attr_getstackaddr(const pthread_attr_t * __restrict,
- void ** __restrict);
-int pthread_attr_getstacksize(const pthread_attr_t * __restrict,
- size_t * __restrict);
-int pthread_attr_init(pthread_attr_t *);
-int pthread_attr_setdetachstate(pthread_attr_t *,
- int );
-int pthread_attr_setguardsize(pthread_attr_t *, size_t );
-int pthread_attr_setinheritsched(pthread_attr_t *,
- int );
-int pthread_attr_setschedparam(pthread_attr_t * __restrict,
- const struct sched_param * __restrict);
-int pthread_attr_setschedpolicy(pthread_attr_t *,
- int );
+int pthread_atfork(void (*prepare)(void), void (*parent)(void),
+ void (*child)(void));
+int pthread_attr_destroy(pthread_attr_t *attr);
+int pthread_attr_getdetachstate(const pthread_attr_t *attr,
+ int *detachstate);
+int pthread_attr_getguardsize(const pthread_attr_t *attr,
+ size_t *guardsize);
+int pthread_attr_getinheritsched(const pthread_attr_t *attr,
+ int *inheritsched);
+int pthread_attr_getschedparam(const pthread_attr_t *attr,
+ struct sched_param *param);
+int pthread_attr_getschedpolicy(const pthread_attr_t *attr,
+ int *policy);
+int pthread_attr_getscope(pthread_attr_t *, int *);
+int pthread_attr_getstack(const pthread_attr_t *attr,
+ void **stackaddr, size_t *stacksize);
+int pthread_attr_getstackaddr(const pthread_attr_t *attr,
+ void **stackaddr);
+int pthread_attr_getstacksize(const pthread_attr_t *attr,
+ size_t *stacksize);
+int pthread_attr_init(pthread_attr_t *attr);
+int pthread_attr_setdetachstate(pthread_attr_t *attr,
+ int detachstate);
+int pthread_attr_setguardsize(pthread_attr_t *attr, size_t guardsize);
+int pthread_attr_setinheritsched(pthread_attr_t *attr,
+ int inheritsched);
+int pthread_attr_setschedparam(pthread_attr_t *attr,
+ const struct sched_param *param);
+int pthread_attr_setschedpolicy(pthread_attr_t *attr,
+ int policy);
int pthread_attr_setscope(pthread_attr_t *, int);
-int pthread_attr_setstack(pthread_attr_t *,
- void *, size_t );
-int pthread_attr_setstackaddr(pthread_attr_t *,
- void *);
-int pthread_attr_setstacksize(pthread_attr_t *, size_t );
-int pthread_cancel(pthread_t ) __DARWIN_ALIAS(pthread_cancel);
-
-int pthread_cond_broadcast(pthread_cond_t *);
-int pthread_cond_destroy(pthread_cond_t *);
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_COND_INIT
-//End-Libc
-int pthread_cond_init(pthread_cond_t * __restrict,
- const pthread_condattr_t * __restrict) __DARWIN_ALIAS(pthread_cond_init);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_COND_INIT */
-int pthread_cond_init(pthread_cond_t * __restrict,
- const pthread_condattr_t * __restrict) LIBC_ALIAS(pthread_cond_init);
-#endif /* !LIBC_ALIAS_PTHREAD_COND_INIT */
-//End-Libc
-int pthread_cond_signal(pthread_cond_t *);
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_COND_TIMEDWAIT
-//End-Libc
-int pthread_cond_timedwait(pthread_cond_t * __restrict,
- pthread_mutex_t * __restrict,
- const struct timespec * __restrict) __DARWIN_ALIAS_C(pthread_cond_timedwait);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_COND_TIMEDWAIT */
-int pthread_cond_timedwait(pthread_cond_t * __restrict,
- pthread_mutex_t * __restrict,
- const struct timespec * __restrict) LIBC_ALIAS_C(pthread_cond_timedwait);
-#endif /* !LIBC_ALIAS_PTHREAD_COND_TIMEDWAIT */
-//End-Libc
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_COND_WAIT
-//End-Libc
-int pthread_cond_wait(pthread_cond_t * __restrict,
- pthread_mutex_t * __restrict) __DARWIN_ALIAS_C(pthread_cond_wait);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_COND_WAIT */
-int pthread_cond_wait(pthread_cond_t * __restrict,
- pthread_mutex_t * __restrict) LIBC_ALIAS_C(pthread_cond_wait);
-#endif /* !LIBC_ALIAS_PTHREAD_COND_WAIT */
-//End-Libc
-int pthread_condattr_destroy(pthread_condattr_t *);
-int pthread_condattr_init(pthread_condattr_t *);
-int pthread_condattr_getpshared(const pthread_condattr_t * __restrict,
- int * __restrict);
-int pthread_condattr_setpshared(pthread_condattr_t *,
- int );
-int pthread_create(pthread_t * __restrict,
- const pthread_attr_t * __restrict,
- void *(*)(void *),
- void * __restrict);
-int pthread_detach(pthread_t );
-int pthread_equal(pthread_t ,
- pthread_t );
-void pthread_exit(void *) __dead2;
+int pthread_attr_setstack(pthread_attr_t *attr,
+ void *stackaddr, size_t stacksize);
+int pthread_attr_setstackaddr(pthread_attr_t *attr,
+ void *stackaddr);
+int pthread_attr_setstacksize(pthread_attr_t *attr, size_t stacksize);
+int pthread_cancel(pthread_t thread) __DARWIN_ALIAS(pthread_cancel);
+
+int pthread_cond_broadcast(pthread_cond_t *cond);
+int pthread_cond_destroy(pthread_cond_t *cond);
+int pthread_cond_init(pthread_cond_t *cond,
+ const pthread_condattr_t *attr);
+int pthread_cond_signal(pthread_cond_t *cond);
+int pthread_cond_timedwait(pthread_cond_t *cond,
+ pthread_mutex_t *mutex,
+ const struct timespec *abstime) __DARWIN_ALIAS(pthread_cond_timedwait);
+int pthread_cond_wait(pthread_cond_t *cond,
+ pthread_mutex_t *mutex) __DARWIN_ALIAS(pthread_cond_wait);
+int pthread_condattr_destroy(pthread_condattr_t *attr);
+int pthread_condattr_getpshared(const pthread_condattr_t *attr,
+ int *pshared);
+int pthread_condattr_init(pthread_condattr_t *attr);
+int pthread_condattr_setpshared(pthread_condattr_t *attr,
+ int pshared);
+int pthread_create(pthread_t *thread,
+ const pthread_attr_t *attr,
+ void *(*start_routine)(void *),
+ void *arg);
+int pthread_detach(pthread_t thread);
+int pthread_equal(pthread_t t1,
+ pthread_t t2);
+void pthread_exit(void *value_ptr) __dead2;
int pthread_getconcurrency(void);
-int pthread_getschedparam(pthread_t , int * __restrict, struct sched_param * __restrict);
-void *pthread_getspecific(pthread_key_t );
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_JOIN
-//End-Libc
-int pthread_join(pthread_t , void **) __DARWIN_ALIAS_C(pthread_join);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_JOIN */
-int pthread_join(pthread_t , void **) LIBC_ALIAS_C(pthread_join);
-#endif /* !LIBC_ALIAS_PTHREAD_JOIN */
-//End-Libc
-int pthread_key_create(pthread_key_t *, void (*)(void *));
-int pthread_key_delete(pthread_key_t );
-int pthread_mutex_destroy(pthread_mutex_t *);
-int pthread_mutex_getprioceiling(const pthread_mutex_t * __restrict, int * __restrict);
-int pthread_mutex_init(pthread_mutex_t * __restrict, const pthread_mutexattr_t * __restrict);
-int pthread_mutex_lock(pthread_mutex_t *);
-int pthread_mutex_setprioceiling(pthread_mutex_t * __restrict, int, int * __restrict);
-int pthread_mutex_trylock(pthread_mutex_t *);
-int pthread_mutex_unlock(pthread_mutex_t *);
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_MUTEXATTR_DESTROY
-//End-Libc
-int pthread_mutexattr_destroy(pthread_mutexattr_t *) __DARWIN_ALIAS(pthread_mutexattr_destroy);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_MUTEXATTR_DESTROY */
-int pthread_mutexattr_destroy(pthread_mutexattr_t *) LIBC_ALIAS(pthread_mutexattr_destroy);
-#endif /* !LIBC_ALIAS_PTHREAD_MUTEXATTR_DESTROY */
-//End-Libc
-int pthread_mutexattr_getprioceiling(const pthread_mutexattr_t * __restrict, int * __restrict);
-int pthread_mutexattr_getprotocol(const pthread_mutexattr_t * __restrict, int * __restrict);
-int pthread_mutexattr_getpshared(const pthread_mutexattr_t * __restrict, int * __restrict);
-int pthread_mutexattr_gettype(const pthread_mutexattr_t * __restrict, int * __restrict);
-int pthread_mutexattr_init(pthread_mutexattr_t *);
-int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *, int);
-int pthread_mutexattr_setprotocol(pthread_mutexattr_t *, int);
-int pthread_mutexattr_setpshared(pthread_mutexattr_t *, int );
-int pthread_mutexattr_settype(pthread_mutexattr_t *, int);
-int pthread_once(pthread_once_t *, void (*)(void));
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_RWLOCK_DESTROY
-//End-Libc
-int pthread_rwlock_destroy(pthread_rwlock_t * ) __DARWIN_ALIAS(pthread_rwlock_destroy);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_RWLOCK_DESTROY */
-int pthread_rwlock_destroy(pthread_rwlock_t * ) LIBC_ALIAS(pthread_rwlock_destroy);
-#endif /* !LIBC_ALIAS_PTHREAD_RWLOCK_DESTROY */
-//End-Libc
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_RWLOCK_INIT
-//End-Libc
-int pthread_rwlock_init(pthread_rwlock_t * __restrict, const pthread_rwlockattr_t * __restrict) __DARWIN_ALIAS(pthread_rwlock_init);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_RWLOCK_INIT */
-int pthread_rwlock_init(pthread_rwlock_t * __restrict, const pthread_rwlockattr_t * __restrict) LIBC_ALIAS(pthread_rwlock_init);
-#endif /* !LIBC_ALIAS_PTHREAD_RWLOCK_INIT */
-//End-Libc
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_RWLOCK_RDLOCK
-//End-Libc
-int pthread_rwlock_rdlock(pthread_rwlock_t *) __DARWIN_ALIAS(pthread_rwlock_rdlock);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_RWLOCK_RDLOCK */
-int pthread_rwlock_rdlock(pthread_rwlock_t *) LIBC_ALIAS(pthread_rwlock_rdlock);
-#endif /* !LIBC_ALIAS_PTHREAD_RWLOCK_RDLOCK */
-//End-Libc
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_RWLOCK_TRYRDLOCK
-//End-Libc
-int pthread_rwlock_tryrdlock(pthread_rwlock_t *) __DARWIN_ALIAS(pthread_rwlock_tryrdlock);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_RWLOCK_TRYRDLOCK */
-int pthread_rwlock_tryrdlock(pthread_rwlock_t *) LIBC_ALIAS(pthread_rwlock_tryrdlock);
-#endif /* !LIBC_ALIAS_PTHREAD_RWLOCK_TRYRDLOCK */
-//End-Libc
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_RWLOCK_TRYWRLOCK
-//End-Libc
-int pthread_rwlock_trywrlock(pthread_rwlock_t *) __DARWIN_ALIAS(pthread_rwlock_trywrlock);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_RWLOCK_TRYWRLOCK */
-int pthread_rwlock_trywrlock(pthread_rwlock_t *) LIBC_ALIAS(pthread_rwlock_trywrlock);
-#endif /* !LIBC_ALIAS_PTHREAD_RWLOCK_TRYWRLOCK */
-//End-Libc
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_RWLOCK_WRLOCK
-//End-Libc
-int pthread_rwlock_wrlock(pthread_rwlock_t *) __DARWIN_ALIAS(pthread_rwlock_wrlock);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_RWLOCK_WRLOCK */
-int pthread_rwlock_wrlock(pthread_rwlock_t *) LIBC_ALIAS(pthread_rwlock_wrlock);
-#endif /* !LIBC_ALIAS_PTHREAD_RWLOCK_WRLOCK */
-//End-Libc
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_RWLOCK_UNLOCK
-//End-Libc
-int pthread_rwlock_unlock(pthread_rwlock_t *) __DARWIN_ALIAS(pthread_rwlock_unlock);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_RWLOCK_UNLOCK */
-int pthread_rwlock_unlock(pthread_rwlock_t *) LIBC_ALIAS(pthread_rwlock_unlock);
-#endif /* !LIBC_ALIAS_PTHREAD_RWLOCK_UNLOCK */
-//End-Libc
-int pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
-int pthread_rwlockattr_getpshared(const pthread_rwlockattr_t * __restrict,
- int * __restrict);
-int pthread_rwlockattr_init(pthread_rwlockattr_t *);
-int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *,
- int );
+int pthread_getschedparam(pthread_t thread,
+ int *policy,
+ struct sched_param *param);
+void *pthread_getspecific(pthread_key_t key);
+int pthread_join(pthread_t thread,
+ void **value_ptr) __DARWIN_ALIAS(pthread_join);
+int pthread_key_create(pthread_key_t *key,
+ void (*destructor)(void *));
+int pthread_key_delete(pthread_key_t key);
+int pthread_mutex_destroy(pthread_mutex_t *mutex);
+int pthread_mutex_getprioceiling(const pthread_mutex_t *mutex,
+ int *prioceiling);
+int pthread_mutex_init(pthread_mutex_t *mutex,
+ const pthread_mutexattr_t *attr);
+int pthread_mutex_lock(pthread_mutex_t *mutex);
+int pthread_mutex_setprioceiling(pthread_mutex_t *mutex,
+ int prioceiling,
+ int *old_prioceiling);
+int pthread_mutex_trylock(pthread_mutex_t *mutex);
+int pthread_mutex_unlock(pthread_mutex_t *mutex);
+int pthread_mutexattr_destroy(pthread_mutexattr_t *attr);
+int pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *attr,
+ int *prioceiling);
+int pthread_mutexattr_getprotocol(const pthread_mutexattr_t *attr,
+ int *protocol);
+int pthread_mutexattr_getpshared(const pthread_mutexattr_t *attr,
+ int *pshared);
+int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr,
+ int *type);
+int pthread_mutexattr_init(pthread_mutexattr_t *attr);
+int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *attr,
+ int prioceiling);
+int pthread_mutexattr_setprotocol(pthread_mutexattr_t *attr,
+ int protocol);
+int pthread_mutexattr_setpshared(pthread_mutexattr_t *attr,
+ int pshared);
+int pthread_mutexattr_settype(pthread_mutexattr_t *attr,
+ int type);
+int pthread_once(pthread_once_t *once_control,
+ void (*init_routine)(void));
+int pthread_rwlock_destroy(pthread_rwlock_t * rwlock);
+int pthread_rwlock_init(pthread_rwlock_t * rwlock,
+ const pthread_rwlockattr_t *attr);
+int pthread_rwlock_rdlock(pthread_rwlock_t *rwlock);
+int pthread_rwlock_tryrdlock(pthread_rwlock_t *rwlock);
+int pthread_rwlock_trywrlock(pthread_rwlock_t *rwlock);
+int pthread_rwlock_unlock(pthread_rwlock_t *rwlock);
+int pthread_rwlock_wrlock(pthread_rwlock_t *rwlock);
+int pthread_rwlockattr_destroy(pthread_rwlockattr_t *attr);
+int pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *attr,
+ int *pshared);
+int pthread_rwlockattr_init(pthread_rwlockattr_t *attr);
+int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *attr,
+ int pshared);
pthread_t pthread_self(void);
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_SETCANCELSTATE
-//End-Libc
-int pthread_setcancelstate(int , int *) __DARWIN_ALIAS(pthread_setcancelstate);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_SETCANCELSTATE */
-int pthread_setcancelstate(int , int *) LIBC_ALIAS(pthread_setcancelstate);
-#endif /* !LIBC_ALIAS_PTHREAD_SETCANCELSTATE */
-//End-Libc
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_SETCANCELTYPE
-//End-Libc
-int pthread_setcanceltype(int , int *) __DARWIN_ALIAS(pthread_setcanceltype);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_SETCANCELTYPE */
-int pthread_setcanceltype(int , int *) LIBC_ALIAS(pthread_setcanceltype);
-#endif /* !LIBC_ALIAS_PTHREAD_SETCANCELTYPE */
-//End-Libc
+int pthread_setcancelstate(int state, int *oldstate) __DARWIN_ALIAS(pthread_setcancelstate);
+int pthread_setcanceltype(int type, int *oldtype) __DARWIN_ALIAS(pthread_setcanceltype);
int pthread_setconcurrency(int);
-int pthread_setschedparam(pthread_t ,
- int ,
- const struct sched_param *);
-int pthread_setspecific(pthread_key_t ,
- const void *);
+int pthread_setschedparam(pthread_t thread,
+ int policy,
+ const struct sched_param *param);
+int pthread_setspecific(pthread_key_t key,
+ const void *value);
void pthread_testcancel(void) __DARWIN_ALIAS(pthread_testcancel);
-#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || defined(_DARWIN_C_SOURCE)
+#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
/* returns non-zero if pthread_create or cthread_fork have been called */
int pthread_is_threaded_np(void);
@@ -484,29 +381,18 @@
int pthread_cond_signal_thread_np(pthread_cond_t *, pthread_t);
/* Like pthread_cond_timedwait, but use a relative timeout */
-int pthread_cond_timedwait_relative_np(pthread_cond_t *,
- pthread_mutex_t *,
- const struct timespec *);
+int pthread_cond_timedwait_relative_np(pthread_cond_t *cond,
+ pthread_mutex_t *mutex,
+ const struct timespec *reltime);
/* Like pthread_create(), but leaves the thread suspended */
-int pthread_create_suspended_np(pthread_t *,
- const pthread_attr_t *,
- void *(*)(void *),
- void *);
+int pthread_create_suspended_np(pthread_t *thread,
+ const pthread_attr_t *attr,
+ void *(*start_routine)(void *),
+ void *arg);
int pthread_kill(pthread_t, int);
-
-pthread_t pthread_from_mach_thread_np(mach_port_t);
-
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_SIGMASK
-//End-Libc
-int pthread_sigmask(int, const sigset_t *, sigset_t *) __DARWIN_ALIAS(pthread_sigmask);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_SIGMASK */
-int pthread_sigmask(int, const sigset_t *, sigset_t *) LIBC_ALIAS(pthread_sigmask);
-#endif /* !LIBC_ALIAS_PTHREAD_SIGMASK */
-//End-Libc
+int pthread_sigmask(int, const sigset_t *, sigset_t *);
void pthread_yield_np(void);
-#endif /* (!_POSIX_C_SOURCE && !_XOPEN_SOURCE) || _DARWIN_C_SOURCE */
+#endif /* ! _POSIX_C_SOURCE && ! _XOPEN_SOURCE */
__END_DECLS
-#endif /* _PTHREAD_H */
+#endif /* _POSIX_PTHREAD_H */