DARWIN -> __MACOSX__

This commit is contained in:
Steve Checkoway
2005-06-21 08:56:36 +00:00
parent 1795ac93c1
commit 99387583f9
19 changed files with 31 additions and 34 deletions
@@ -11,7 +11,7 @@
#include "archutils/Unix/RunningUnderValgrind.h"
#endif
#if defined(DARWIN)
#if defined(__MACOSX__)
#include "archutils/Darwin/DarwinThreadHelpers.h"
#endif
@@ -106,7 +106,7 @@ MutexImpl_Pthreads::~MutexImpl_Pthreads()
}
#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(DARWIN)
#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(__MACOSX__)
static bool UseTimedlock()
{
#if defined(LINUX)
@@ -337,7 +337,7 @@ void SemaImpl_Pthreads::Post()
bool SemaImpl_Pthreads::Wait()
{
#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(DARWIN)
#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(__MACOSX__)
if( UseTimedlock() )
{
timeval tv;