Fix warning when assertions disabled.

[oota-llvm.git] / lib / System / Mutex.cpp

diff --git a/lib/System/Mutex.cpp b/lib/System/Mutex.cpp
index abcf77e67511f82ea5f39145381061f338a73d0e..3bef7ce0b02e4fd7656614b7549f13ec2af6e9fd 100644 (file)
--- a/lib/System/Mutex.cpp
+++ b/lib/System/Mutex.cpp
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Reid Spencer and is distributed under the
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -52,7 +52,7 @@ using namespace sys;
 //       is configured into the LIBS variable.
 // Note: this line of code generates a warning if pthread_mutex_init is not
 //       declared with weak linkage. It's safe to ignore the warning.
-static const bool pthread_enabled = static_cast<bool>(pthread_mutex_init);
+static const bool pthread_enabled = true;
 
 // Construct a Mutex using pthread calls
 Mutex::Mutex( bool recursive)
@@ -75,7 +75,7 @@ Mutex::Mutex( bool recursive)
     errorcode = pthread_mutexattr_settype(&attr, kind);
     assert(errorcode == 0);
 
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
     // Make it a process local mutex
     errorcode = pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_PRIVATE);
 #endif
@@ -100,7 +100,7 @@ Mutex::~Mutex()
   {
     pthread_mutex_t* mutex = reinterpret_cast<pthread_mutex_t*>(data_);
     assert(mutex != 0);
-    int errorcode = pthread_mutex_destroy(mutex);
+    pthread_mutex_destroy(mutex);
     assert(mutex != 0);
   }
 }
@@ -157,3 +157,4 @@ Mutex::tryacquire()
 #warning Neither LLVM_ON_UNIX nor LLVM_ON_WIN32 was set in System/Mutex.cpp
 #endif
 #endif
+