summaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-08-23 13:59:41 -0700
committerUlrich Drepper <drepper@redhat.com>2009-08-23 13:59:41 -0700
commit2d094b739598d2e1718d3cc4c5af7e95787bd463 (patch)
tree575a7790a137f3044d6ed812ba7f4dc2c5b1dbe0 /nptl
parentc6b6723e6b756d36d9912a1c430459634e15758b (diff)
More namespace cleanups.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h10
2 files changed, 10 insertions, 4 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 88975a76e0..098ef3ba2d 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 f9fa4e52eb..2550355cdc 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