diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-11-26 17:08:28 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-11-26 17:08:28 +0100 |
| commit | 3406787f935eab24ada638489b2c776925c8b246 (patch) | |
| tree | 7fbf892d5a005d42bd0e037310a4f52ae7248e9a /libpthread/include/pthread | |
| parent | ed19b110d993a58455360ea7257c1f069eb856ce (diff) | |
| parent | e169bc9d6e94164ff3b991389d6376a66c3f96e9 (diff) | |
Merge branch 'upstream-merged'
Diffstat (limited to 'libpthread/include/pthread')
| -rw-r--r-- | libpthread/include/pthread/pthread.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpthread/include/pthread/pthread.h b/libpthread/include/pthread/pthread.h index 4dbcb0cb..cd32fb22 100644 --- a/libpthread/include/pthread/pthread.h +++ b/libpthread/include/pthread/pthread.h @@ -240,7 +240,7 @@ extern pthread_t pthread_self (void); #define PTHREAD_MUTEX_TIMED_NP __PTHREAD_MUTEX_TIMED #define PTHREAD_MUTEX_ERRORCHECK_NP __PTHREAD_MUTEX_ERRORCHECK #define PTHREAD_MUTEX_RECURSIVE_NP __PTHREAD_MUTEX_RECURSIVE -#ifdef __USE_UNIX98 +#if defined __USE_UNIX98 || defined __USE_XOPEN2K8 #define PTHREAD_MUTEX_NORMAL PTHREAD_MUTEX_TIMED_NP #define PTHREAD_MUTEX_ERRORCHECK PTHREAD_MUTEX_ERRORCHECK_NP #define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP @@ -295,7 +295,7 @@ extern int pthread_mutexattr_setpshared(pthread_mutexattr_t *attr, int pshared); -#ifdef __USE_UNIX98 +#if defined __USE_UNIX98 || defined __USE_XOPEN2K8 /* Return the value of the type attribute in *ATTR in *TYPE. */ extern int pthread_mutexattr_gettype(const pthread_mutexattr_t *__restrict attr, int *__restrict type); |