Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From be665d9513cca7e8b64c79ae424cf44ac166b052 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 14 Sep 2017 17:07:58 -0700 |
| 4 | Subject: [PATCH] plugins: Check for PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP |
| 5 | before use |
| 6 | |
| 7 | musl does not define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP |
| 8 | so we can not assume that all Linux systems support PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP |
| 9 | its a glibc specific define so check for it being defined before using it |
| 10 | |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | --- |
| 13 | Upstream-Status: Pending |
| 14 | |
| 15 | plugins/dynamic_simulator/thread.cpp | 2 +- |
| 16 | plugins/ipmidirect/thread.cpp | 2 +- |
| 17 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 18 | |
| 19 | diff --git a/plugins/dynamic_simulator/thread.cpp b/plugins/dynamic_simulator/thread.cpp |
| 20 | index d663be0..9210fd7 100644 |
| 21 | --- a/plugins/dynamic_simulator/thread.cpp |
| 22 | +++ b/plugins/dynamic_simulator/thread.cpp |
| 23 | @@ -229,7 +229,7 @@ cThread::Exit( void *rv ) |
| 24 | /** |
| 25 | * Constructor |
| 26 | **/ |
| 27 | -#if ( defined(__sun) && defined(__SVR4) ) || defined(__FreeBSD__) |
| 28 | +#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP |
| 29 | cThreadLock::cThreadLock() |
| 30 | { |
| 31 | pthread_mutexattr_t attr; |
| 32 | diff --git a/plugins/ipmidirect/thread.cpp b/plugins/ipmidirect/thread.cpp |
| 33 | index 5c52557..48e83fa 100644 |
| 34 | --- a/plugins/ipmidirect/thread.cpp |
| 35 | +++ b/plugins/ipmidirect/thread.cpp |
| 36 | @@ -167,7 +167,7 @@ cThread::Exit( void *rv ) |
| 37 | // cThreadLock |
| 38 | ////////////////////////////////////////////////// |
| 39 | |
| 40 | -#if ( defined(__sun) && defined(__SVR4) ) || defined(__FreeBSD__) |
| 41 | +#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP |
| 42 | cThreadLock::cThreadLock() |
| 43 | { |
| 44 | pthread_mutexattr_t attr; |
| 45 | -- |
| 46 | 2.14.1 |
| 47 | |