summaryrefslogtreecommitdiff
path: root/libc/conform/data
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-02-08 16:44:31 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-02-08 16:44:31 +0000
commit78be84cd747c2e3965bf6c2fd5f702d6ff2f5525 (patch)
treec070a60ef7c5371bef8b7a559442a6920b394c8e /libc/conform/data
parentde06548e980675e65a1e6d850bb8c3a3f7ec638d (diff)
downloadeglibc2-78be84cd747c2e3965bf6c2fd5f702d6ff2f5525.tar.gz
Merge changes between r16568 and r17050 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@17051 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/conform/data')
-rw-r--r--libc/conform/data/pthread.h-data2
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/conform/data/pthread.h-data b/libc/conform/data/pthread.h-data
index 5a536c7bf..70486cc1e 100644
--- a/libc/conform/data/pthread.h-data
+++ b/libc/conform/data/pthread.h-data
@@ -155,7 +155,7 @@ function int pthread_spin_unlock (pthread_spinlock_t*)
function void pthread_testcancel (void)
# if defined XOPEN2K8 || defined POSIX2008
function int pthread_mutex_consistent (pthread_mutex_t *)
-function int pthread_mutexattr_getrobust (__const pthread_mutexattr_t*, int*)
+function int pthread_mutexattr_getrobust (const pthread_mutexattr_t*, int*)
function int pthread_mutexattr_setrobust (pthread_mutexattr_t*, int)
# endif