__MACOSX__ --> MACOSX, keep __MACOSX__ for ogg.

This commit is contained in:
Steve Checkoway
2005-10-24 10:37:56 +00:00
parent 283747e8c9
commit aa0f90feae
24 changed files with 52 additions and 35 deletions
@@ -10,7 +10,7 @@
#include "archutils/Unix/RunningUnderValgrind.h"
#endif
#if defined(__MACOSX__)
#if defined(MACOSX)
#include "archutils/Darwin/DarwinThreadHelpers.h"
#endif
@@ -109,7 +109,7 @@ MutexImpl_Pthreads::~MutexImpl_Pthreads()
}
#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(__MACOSX__)
#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(MACOSX)
static bool UseTimedlock()
{
#if defined(LINUX)
@@ -336,7 +336,7 @@ void SemaImpl_Pthreads::Post()
bool SemaImpl_Pthreads::Wait()
{
#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(__MACOSX__)
#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(MACOSX)
if( UseTimedlock() )
{
timeval tv;