auto merge of #8143 : brson/rust/change-dir-lock, r=luqmana

bors · bors · commit 5d409ccd30c9 · 2013-07-31T05:46:21.000-07:00
diff --git 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();
 }
 
 //

Original file line number	Diff line number	Diff line change
`@@ -932,12 +932,12 @@ static lock_and_signal change_dir_lock;`
`932`	`932`
`933`	`933`	`extern "C" CDECL void`
`934`	`934`	`rust_take_change_dir_lock() {`
`935`		`- global_args_lock.lock();`
	`935`	`+ change_dir_lock.lock();`
`936`	`936`	`}`
`937`	`937`
`938`	`938`	`extern "C" CDECL void`
`939`	`939`	`rust_drop_change_dir_lock() {`
`940`		`- global_args_lock.unlock();`
	`940`	`+ change_dir_lock.unlock();`
`941`	`941`	`}`
`942`	`942`
`943`	`943`	`//`