about summary refs log tree commit diff
path: root/src/rt/rust_builtin.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-10-17 01:36:33 -0700
committerbors <bors@rust-lang.org>2013-10-17 01:36:33 -0700
commit386fa1d818f341004e511af24da9f257d35cdbd2 (patch)
treedac671bfbf44c2bc48308b91a9140191cbf0cf0b /src/rt/rust_builtin.cpp
parent00adcf0bdd9376046859b7bc0d79097b621844c5 (diff)
parentf766acad62cd5cf7ed701a9521db2f2a96039778 (diff)
downloadrust-386fa1d818f341004e511af24da9f257d35cdbd2.tar.gz
rust-386fa1d818f341004e511af24da9f257d35cdbd2.zip
auto merge of #9897 : thestinger/rust/rusti, r=alexcrichton
Closes #9818
Closes #9567
Closes #8924
Closes #8910
Closes #8392
Closes #7692
Closes #7499
Closes #7220
Closes #5038
Diffstat (limited to 'src/rt/rust_builtin.cpp')
-rw-r--r--src/rt/rust_builtin.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index 13fc3f1aa81..9750e22e945 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -570,18 +570,6 @@ rust_drop_env_lock() {
     env_lock.unlock();
 }
 
-static lock_and_signal linenoise_lock;
-
-extern "C" CDECL void
-rust_take_linenoise_lock() {
-    linenoise_lock.lock();
-}
-
-extern "C" CDECL void
-rust_drop_linenoise_lock() {
-    linenoise_lock.unlock();
-}
-
 static lock_and_signal dlerror_lock;
 
 extern "C" CDECL void