aboutsummaryrefslogtreecommitdiffhomepage
path: root/common.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2014-07-07 00:38:37 -0700
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2014-07-07 00:38:37 -0700
commit3ff104ba302d7cccbdf21014e68ab4cfff468d5c (patch)
tree43173b65a0ffc14df2c3e7900d32b63621f652d1 /common.cpp
parent706286c28956e51873bfe6b673bea5be01ee7839 (diff)
Rename lock_t to mutex_lock_t to fix Solaris compilation
Fixes #1510
Diffstat (limited to 'common.cpp')
-rw-r--r--common.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/common.cpp b/common.cpp
index 81d7b839..001eab0f 100644
--- a/common.cpp
+++ b/common.cpp
@@ -2225,7 +2225,7 @@ scoped_lock::scoped_lock(pthread_mutex_t &mutex) : lock_obj(&mutex), locked(fals
this->lock();
}
-scoped_lock::scoped_lock(lock_t &lock) : lock_obj(&lock.mutex), locked(false)
+scoped_lock::scoped_lock(mutex_lock_t &lock) : lock_obj(&lock.mutex), locked(false)
{
this->lock();
}