github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 13:24:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename lock_t to mutex_lock_t to fix Solaris compilation

Browse Source 
Fixes #1510
This commit is contained in:
ridiculousfish 2014-07-07 00:38:37 -07:00
parent 706286c289
commit 3ff104ba30
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.cpp
View File

@ -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();
}

8
common.h
View File

@ -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();
};

1
parse_util.cpp
View File

@ -1197,6 +1197,7 @@ parser_test_error_bits_t parse_util_detect_errors_in_argument(const parse_node_t
err=1;
if (out_errors)
{
fprintf(stderr, "HELLO!\n");
parse_util_expand_variable_error(node, unesc, idx, node.source_start, out_errors);
}
}