diff options
| author | Chad Versace <chad.versace@intel.com> | 2015-03-27 11:31:23 -0700 |
|---|---|---|
| committer | Chad Versace <chad.versace@intel.com> | 2015-03-27 11:31:23 -0700 |
| commit | d39a41bf31bad395498fd7f1e755260aec37e3ec (patch) | |
| tree | 72da74d232a5d9de1dd9d7a482f43fa9ed521d7d | |
| parent | a067c6493636eb98b60d2fbd8f747900a30a24b7 (diff) | |
| parent | 8b5766929bfc717acc4ef6feb22126e694ea5474 (diff) | |
| download | waffle-d39a41bf31bad395498fd7f1e755260aec37e3ec.tar.gz | |
Merge branch 'master' into next
* master:
third_party/threads: Use PTHREAD_MUTEX_RECURSIVE by default
| -rw-r--r-- | third_party/threads/threads_posix.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/third_party/threads/threads_posix.c b/third_party/threads/threads_posix.c index 5835e43..e122bf9 100644 --- a/third_party/threads/threads_posix.c +++ b/third_party/threads/threads_posix.c @@ -26,6 +26,9 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ + +#define _GNU_SOURCE + #include <stdlib.h> #ifndef assert #include <assert.h> @@ -150,13 +153,8 @@ int mtx_init(mtx_t *mtx, int type) && type != (mtx_try|mtx_recursive)) return thrd_error; pthread_mutexattr_init(&attr); - if ((type & mtx_recursive) != 0) { -#if defined(__linux__) || defined(__linux) - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); -#else + if ((type & mtx_recursive) != 0) pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); -#endif - } pthread_mutex_init(mtx, &attr); pthread_mutexattr_destroy(&attr); return thrd_success; |