about summary refs log tree commit diff
path: root/src/libstd/lib.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-04-06 02:56:39 -0700
committerbors <bors@rust-lang.org>2014-04-06 02:56:39 -0700
commitf1f50565a1fda0dfd60d89fea65e2328f42cc5e0 (patch)
treec6afc2ec113c761b4a284e1370f00f29155f7025 /src/libstd/lib.rs
parent667f82a79b2275a696b21086ddf5148a617fe20a (diff)
parent38f7a1b41b0ff9c1bcaec9a892c8ffb64ad6139f (diff)
downloadrust-f1f50565a1fda0dfd60d89fea65e2328f42cc5e0.tar.gz
rust-f1f50565a1fda0dfd60d89fea65e2328f42cc5e0.zip
auto merge of #13315 : alexcrichton/rust/libc, r=alexcrichton,me
Rebasing of #12526 with a very obscure bug fixed on windows.
Diffstat (limited to 'src/libstd/lib.rs')
-rw-r--r--src/libstd/lib.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 42d35b60896..1a5ca76d5c0 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -71,6 +71,9 @@
 // Make and rand accessible for benchmarking/testcases
 #[cfg(test)] extern crate rand;
 
+// we wrap some libc stuff
+extern crate libc;
+
 // Make std testable by not duplicating lang items. See #2912
 #[cfg(test)] extern crate realstd = "std";
 #[cfg(test)] pub use kinds = realstd::kinds;
@@ -174,8 +177,6 @@ pub mod sync;
 
 /* Runtime and platform support */
 
-#[unstable]
-pub mod libc;
 pub mod c_str;
 pub mod c_vec;
 pub mod os;