aboutsummaryrefslogtreecommitdiffhomepage
path: root/common.h
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.h
parent706286c28956e51873bfe6b673bea5be01ee7839 (diff)
Rename lock_t to mutex_lock_t to fix Solaris compilation
Fixes #1510
Diffstat (limited to 'common.h')
-rw-r--r--common.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/common.h b/common.h
index ca4c8337..ff12760d 100644
--- a/common.h
+++ b/common.h
@@ -538,16 +538,16 @@ public:
bool is_forked_child();
-class lock_t
+class mutex_lock_t
{
public:
pthread_mutex_t mutex;
- lock_t()
+ mutex_lock_t()
{
pthread_mutex_init(&mutex, NULL);
}
- ~lock_t()
+ ~mutex_lock_t()
{
pthread_mutex_destroy(&mutex);
}
@@ -567,7 +567,7 @@ public:
void lock(void);
void unlock(void);
scoped_lock(pthread_mutex_t &mutex);
- scoped_lock(lock_t &lock);
+ scoped_lock(mutex_lock_t &lock);
~scoped_lock();
};