---

bors · bors · commit 784d44be0140 · 2013-07-31T05:46:21.000-07:00
yaml --- r: 64905 b: refs/heads/snap-stage3 c: 5d409cc h: refs/heads/master i: 64903: 5a93358 v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 6296dc0d73527301f18ef55b5f2d07c3241b8a00
+refs/heads/snap-stage3: 5d409ccd30c92099f3637e7f5545b4cea6b705b1
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/rt/rust_builtin.cpp b/branches/snap-stage3/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`	`//`