diff options
| author | bors <bors@rust-lang.org> | 2013-07-31 05:46:21 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-31 05:46:21 -0700 |
| commit | 5d409ccd30c92099f3637e7f5545b4cea6b705b1 (patch) | |
| tree | 7c2241a67fb7c1d15d583f5453a560ea7287be80 /src/rt/rust_builtin.cpp | |
| parent | 6296dc0d73527301f18ef55b5f2d07c3241b8a00 (diff) | |
| parent | 91f1ab48969e1b7d3f4871348db2ec302000c93a (diff) | |
| download | rust-5d409ccd30c92099f3637e7f5545b4cea6b705b1.tar.gz rust-5d409ccd30c92099f3637e7f5545b4cea6b705b1.zip | |
auto merge of #8143 : brson/rust/change-dir-lock, r=luqmana
Diffstat (limited to 'src/rt/rust_builtin.cpp')
| -rw-r--r-- | src/rt/rust_builtin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 3c9bff000ea..e6517b3639a 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -932,12 +932,12 @@ static lock_and_signal change_dir_lock; extern "C" CDECL void rust_take_change_dir_lock() { - global_args_lock.lock(); + change_dir_lock.lock(); } extern "C" CDECL void rust_drop_change_dir_lock() { - global_args_lock.unlock(); + change_dir_lock.unlock(); } // |