diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-08-24 10:15:51 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-08-24 10:15:51 +0200 |
| commit | 255acd161cc2d7752a4e79234dcba5d929c3e0a4 (patch) | |
| tree | 94c1d111cce2137ee948ff0e9d735f7a3643ef78 /nptl | |
| parent | 593eff0f9e5bed517e0a8434507ee9f3f4d45b87 (diff) | |
| parent | a0e25a886a9128b280b4c05bc9c6dd12377ea868 (diff) | |
Merge commit 'origin/master' into fedora/master
Conflicts:
sysdeps/powerpc/powerpc64/____longjmp_chk.S
sysdeps/unix/sysv/linux/powerpc/powerpc64/____longjmp_chk.S
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 59a77528e4..193756d45e 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2009-08-23 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/bits/posix_opt.h: Clean up namespace. + 2009-08-11 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S: Add CFI diff --git a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h index e23ad29e3e..e4f002a5c8 100644 --- a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +++ b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -85,15 +85,17 @@ /* We support priority inheritence. */ #define _POSIX_THREAD_PRIO_INHERIT 200809L -/* We support priority inheritence for robust mutexes. */ -#define _POSIX_THREAD_ROBUST_PRIO_INHERIT 200809L - /* We support priority protection, though only for non-robust mutexes. */ #define _POSIX_THREAD_PRIO_PROTECT 200809L +#ifdef __USE_XOPEN2K8 +/* We support priority inheritence for robust mutexes. */ +# define _POSIX_THREAD_ROBUST_PRIO_INHERIT 200809L + /* We do not support priority protection for robust mutexes. */ -#define _POSIX_THREAD_ROBUST_PRIO_PROTECT -1 +# define _POSIX_THREAD_ROBUST_PRIO_PROTECT -1 +#endif /* We support POSIX.1b semaphores. */ #define _POSIX_SEMAPHORES 200809L |