From db1b99d8dd0b6280c60729048b9699bcd190f324 Mon Sep 17 00:00:00 2001 From: ehofman Date: Wed, 26 Oct 2005 11:19:58 +0000 Subject: [PATCH] Back out the shared mutex code since it only works when the mutex is in shared memory[1], something we don't support anyhow. This also fixes a FreeBSD compile problem. [1] http://hypermail.linklord.com/new-httpd.old/2002/Jan/0557.html --- simgear/threads/SGThread.hxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/simgear/threads/SGThread.hxx b/simgear/threads/SGThread.hxx index 5c52607a..69b10b8b 100644 --- a/simgear/threads/SGThread.hxx +++ b/simgear/threads/SGThread.hxx @@ -222,12 +222,19 @@ protected: inline SGMutex::SGMutex() { - pthread_mutexattr_t mutex_attr; +#if 0 + // Note: This will only work if the mutex is in shared memory, + // something we don't support enyhow. -EMH- + pthread_mutexattr_t mutex_attr = 0; pthread_mutexattr_init(&mutex_attr); pthread_mutexattr_setpshared(&mutex_attr, PTHREAD_PROCESS_SHARED); int status = pthread_mutex_init( &mutex, &mutex_attr ); assert( status == 0 ); pthread_mutexattr_destroy(&mutex_attr); +#else + int status = pthread_mutex_init( &mutex, 0 ); + assert( status == 0 ); +#endif } inline SGMutex::~SGMutex()