summaryrefslogtreecommitdiff
path: root/libpthread/include/pthread/pthread.h
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2010-08-01 12:11:21 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2010-08-01 12:11:21 +0200
commit9de2a32ced4076497e26ebfcffbd8c3ec260699b (patch)
treeeb739cf07b7efc0cb81fb65622957f78e01d8111 /libpthread/include/pthread/pthread.h
parent57ef58b1d62c28726f162a0a5cd3d2e7f7c92eed (diff)
parent872345fd3c7bf57a6e6b87e35159b28ff290a965 (diff)
Merge tag 'upstream/20090701'
Diffstat (limited to 'libpthread/include/pthread/pthread.h')
-rw-r--r--libpthread/include/pthread/pthread.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/libpthread/include/pthread/pthread.h b/libpthread/include/pthread/pthread.h
index dedb09d4..e6b92495 100644
--- a/libpthread/include/pthread/pthread.h
+++ b/libpthread/include/pthread/pthread.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002, 2005, 2006, 2007, 2008, 2009
+/* Copyright (C) 2000, 2002, 2005, 2006, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -313,6 +313,8 @@ extern int pthread_mutexattr_settype(pthread_mutexattr_t *attr,
/* Static initializer for recursive mutexes. */
#ifdef __USE_GNU
+# define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
+ __PTHREAD_ERRORCHECK_MUTEX_INITIALIZER
# define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
__PTHREAD_RECURSIVE_MUTEX_INITIALIZER
#endif
@@ -732,6 +734,14 @@ extern int pthread_setschedparam (pthread_t thread, int policy,
/* Set thread THREAD's scheduling priority. */
extern int pthread_setschedprio (pthread_t thread, int prio);
+
+#ifdef __USE_GNU
+/* Yield the processor to another thread or process.
+ This function is similar to the POSIX `sched_yield' function but
+ might be differently implemented in the case of a m-on-n thread
+ implementation. */
+extern int pthread_yield (void);
+#endif
/* Kernel-specific interfaces. */