summaryrefslogtreecommitdiff
path: root/cpp/test/IceUtil/thread/MutexTest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/IceUtil/thread/MutexTest.cpp')
-rw-r--r--cpp/test/IceUtil/thread/MutexTest.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/cpp/test/IceUtil/thread/MutexTest.cpp b/cpp/test/IceUtil/thread/MutexTest.cpp
index a5bbeca5bb6..50b95078988 100644
--- a/cpp/test/IceUtil/thread/MutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MutexTest.cpp
@@ -119,21 +119,13 @@ MutexTest::run()
}
Mutex::TryLock lock2(mutex);
-#if defined(__FreeBSD__) || defined(__linux)
try
{
test(lock.tryAcquire() == false);
}
catch(const IceUtil::ThreadLockedException& ex)
{
- //
- // pthread_mutex_trylock returns EDEADLK in FreeBSD's new threading implementation
- // as well as in Fedora Core 5.
- //
}
-#else
- test(lock.tryAcquire() == false);
-#endif
lock2.release();
test(lock.tryAcquire() == true);
test(lock.acquired());