diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-06-07 11:09:32 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-06-07 11:09:32 +0000 |
commit | 723c8a093c1a79bf03793a2b34befd65bf365737 (patch) | |
tree | df780c83667fedd03e92b9cab0e40ca591c09d0a /usr/src/head | |
parent | 5aaab9921729d6e41146d8ba5e9dcb01b042f41f (diff) | |
parent | a90d75b828f0c01a350c4ecfc3924fd6456fffaf (diff) | |
download | illumos-joyent-20160526.tar.gz |
[illumos-gate merge]20160526
commit a90d75b828f0c01a350c4ecfc3924fd6456fffaf
6993 DEFAULT_TYPE should be probably be removed from pthread.h
Diffstat (limited to 'usr/src/head')
-rw-r--r-- | usr/src/head/pthread.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/usr/src/head/pthread.h b/usr/src/head/pthread.h index 5fe007bf90..91d268a30d 100644 --- a/usr/src/head/pthread.h +++ b/usr/src/head/pthread.h @@ -69,11 +69,6 @@ extern "C" { #define PTHREAD_PROCESS_SHARED 1 /* = USYNC_PROCESS */ #define PTHREAD_PROCESS_PRIVATE 0 /* = USYNC_THREAD */ -#define _DEFAULT_TYPE PTHREAD_PROCESS_PRIVATE -#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) -#define DEFAULT_TYPE _DEFAULT_TYPE -#endif - /* * mutex types * keep these in synch which sys/synch.h lock flags @@ -113,13 +108,13 @@ extern "C" { * should be consistent with the definition for pthread_mutex_t). */ #define PTHREAD_MUTEX_INITIALIZER /* = DEFAULTMUTEX */ \ - {{0, 0, 0, _DEFAULT_TYPE, _MUTEX_MAGIC}, {{{0}}}, 0} + {{0, 0, 0, PTHREAD_PROCESS_PRIVATE, _MUTEX_MAGIC}, {{{0}}}, 0} #define PTHREAD_COND_INITIALIZER /* = DEFAULTCV */ \ - {{{0, 0, 0, 0}, _DEFAULT_TYPE, _COND_MAGIC}, 0} + {{{0, 0, 0, 0}, PTHREAD_PROCESS_PRIVATE, _COND_MAGIC}, 0} #define PTHREAD_RWLOCK_INITIALIZER /* = DEFAULTRWLOCK */ \ - {0, _DEFAULT_TYPE, _RWL_MAGIC, PTHREAD_MUTEX_INITIALIZER, \ + {0, PTHREAD_PROCESS_PRIVATE, _RWL_MAGIC, PTHREAD_MUTEX_INITIALIZER, \ PTHREAD_COND_INITIALIZER, PTHREAD_COND_INITIALIZER} /* cancellation type and state */ |