diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2012-08-30 23:31:39 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-08-30 23:31:39 +0200 |
| commit | 16a92d2765c5732abb64742cb5d387148e0ac629 (patch) | |
| tree | abbbadbf54f87eed25f71a312e43ce7f7cb7adfe /include/pthread/pthread.h | |
| parent | 9a231435f830c459c0e214c2b99877e2ed6edb56 (diff) | |
| parent | 0096579c8bea920f7c42b40ea22db621da6480a5 (diff) | |
Merge commit 'refs/top-bases/t/fix_inline' into t/fix_inlinet/fix_inline
Conflicts:
sysdeps/l4/hurd/pt-sysdep.h
Diffstat (limited to 'include/pthread/pthread.h')
| -rw-r--r-- | include/pthread/pthread.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/pthread/pthread.h b/include/pthread/pthread.h index 4dbcb0c..cd32fb2 100644 --- a/include/pthread/pthread.h +++ b/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); |