Mercurial > hg > orthanc
changeset 938:eb5f03334da6
merge
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 24 Jun 2014 17:59:48 +0200 |
parents | 9c7f5fd8a7a2 (current diff) 1530ff8b8417 (diff) |
children | 4864b3e304be |
files | |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Core/MultiThreading/Mutex.cpp Tue Jun 24 17:59:29 2014 +0200 +++ b/Core/MultiThreading/Mutex.cpp Tue Jun 24 17:59:48 2014 +0200 @@ -37,7 +37,7 @@ #if defined(_WIN32) #include <windows.h> -#elif defined(__linux) || defined(__FreeBSD_kernel__) +#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__APPLE__) #include <pthread.h> #else #error Support your platform here @@ -75,7 +75,7 @@ } -#elif defined(__linux) || defined(__FreeBSD_kernel__) +#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__APPLE__) struct Mutex::PImpl {