[Glibc-bsd-commits] r4491 - trunk/glibc-ports/linuxthreads/sysdeps/pthread

[Petr Salinger]

Author: ps-guest
Date: 2013-05-30 13:54:20 +0000 (Thu, 30 May 2013)
New Revision: 4491

Modified:
   trunk/glibc-ports/linuxthreads/sysdeps/pthread/pthread.h
Log:
any/local-linuxthreads-XPG7.diff:

2011-12-09  Aurelien Jarno  <aurelien at aurel32.net>

        * sysdeps/pthread/pthread.h: Cleanup.  Fix up for XPG7.



Modified: trunk/glibc-ports/linuxthreads/sysdeps/pthread/pthread.h
===================================================================
--- trunk/glibc-ports/linuxthreads/sysdeps/pthread/pthread.h	2013-05-30 13:52:40 UTC (rev 4490)
+++ trunk/glibc-ports/linuxthreads/sysdeps/pthread/pthread.h	2013-05-30 13:54:20 UTC (rev 4491)
@@ -86,7 +86,7 @@
   PTHREAD_MUTEX_RECURSIVE_NP,
   PTHREAD_MUTEX_ERRORCHECK_NP,
   PTHREAD_MUTEX_ADAPTIVE_NP
-#ifdef __USE_UNIX98
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
   ,
   PTHREAD_MUTEX_NORMAL = PTHREAD_MUTEX_TIMED_NP,
   PTHREAD_MUTEX_RECURSIVE = PTHREAD_MUTEX_RECURSIVE_NP,
@@ -241,7 +241,6 @@
 extern int pthread_attr_getscope (__const pthread_attr_t *__restrict __attr,
 				  int *__restrict __scope) __THROW;
 
-#ifdef __USE_UNIX98
 /* Set the size of the guard area at the bottom of the thread.  */
 extern int pthread_attr_setguardsize (pthread_attr_t *__attr,
 				      size_t __guardsize) __THROW;
@@ -250,7 +249,6 @@
 extern int pthread_attr_getguardsize (__const pthread_attr_t *__restrict
 				      __attr, size_t *__restrict __guardsize)
      __THROW;
-#endif
 
 /* Set the starting address of the stack of the thread to be created.
    Depending on whether the stack grows up or down the value must either
@@ -371,7 +369,7 @@
 extern int pthread_mutexattr_setpshared (pthread_mutexattr_t *__attr,
 					 int __pshared) __THROW;
 
-#ifdef __USE_UNIX98
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 /* Set the mutex kind attribute in *ATTR to KIND (either PTHREAD_MUTEX_NORMAL,
    PTHREAD_MUTEX_RECURSIVE, PTHREAD_MUTEX_ERRORCHECK, or
    PTHREAD_MUTEX_DEFAULT).  */