diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-20 20:55:35 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-20 20:55:35 -0500 |
| commit | 6608531271f34cdbff10e87c373c732dc06a9902 (patch) | |
| tree | 36c07f2d09279c854dbe98e64868e97eceb78f32 /external | |
| parent | d10425025a0e0c7501d359aa6f738ca2ddddf7d0 (diff) | |
| parent | 5e61687fdf7f626de93515b3b8468a09e9373931 (diff) | |
| download | monzero-core-6608531271f34cdbff10e87c373c732dc06a9902.tar.gz monzero-core-6608531271f34cdbff10e87c373c732dc06a9902.tar.xz monzero-core-6608531271f34cdbff10e87c373c732dc06a9902.zip | |
Merge pull request #1586
5e61687f mlog: allow overriding log format (moneromooo-monero)
5161f16f easylogging++: enforce recursive mutex (moneromooo-monero)
Diffstat (limited to 'external')
| -rw-r--r-- | external/easylogging++/easylogging++.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h index 688648452..8042392a0 100644 --- a/external/easylogging++/easylogging++.h +++ b/external/easylogging++/easylogging++.h @@ -1001,7 +1001,11 @@ namespace el { public: Mutex(void) { # if ELPP_OS_UNIX - pthread_mutex_init(&m_underlyingMutex, nullptr); + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); + pthread_mutex_init(&m_underlyingMutex, &attr); + pthread_mutexattr_destroy(&attr); # elif ELPP_OS_WINDOWS InitializeCriticalSection(&m_underlyingMutex); # endif // ELPP_OS_UNIX |