auto merge of #13315 : alexcrichton/rust/libc, r=alexcrichton,me

Rebasing of #12526 with a very obscure bug fixed on windows.

4 files changed, 4 insertions, 3 deletions

diff --git a/src/libgreen/lib.rs b/src/libgreen/lib.rs
index 5de8c637cf2..e4a9641efd1 100644
--- a/src/libgreen/lib.rs
+++ b/src/libgreen/lib.rs
@@ -199,6 +199,7 @@
 #[cfg(test)] #[phase(syntax, link)] extern crate log;
 #[cfg(test)] extern crate rustuv;
 extern crate rand;
+extern crate libc;
 
 use std::mem::replace;
 use std::os;
diff --git a/src/libgreen/macros.rs b/src/libgreen/macros.rs
index 599ef8d4077..d1d7a9e0c98 100644
--- a/src/libgreen/macros.rs
+++ b/src/libgreen/macros.rs
@@ -52,7 +52,7 @@ macro_rules! rtabort (
 
 pub fn dumb_println(args: &fmt::Arguments) {
     use std::io;
-    use std::libc;
+    use libc;
 
     struct Stderr;
     impl io::Writer for Stderr {
diff --git a/src/libgreen/sched.rs b/src/libgreen/sched.rs
index 683df846d62..036d02655f9 100644
--- a/src/libgreen/sched.rs
+++ b/src/libgreen/sched.rs
@@ -976,7 +976,7 @@ fn new_sched_rng() -> XorShiftRng {
 }
 #[cfg(unix)]
 fn new_sched_rng() -> XorShiftRng {
-    use std::libc;
+    use libc;
     use std::mem;
     use rand::SeedableRng;
 
diff --git a/src/libgreen/stack.rs b/src/libgreen/stack.rs
index 497c1dc664a..b8ab4d5f8c1 100644
--- a/src/libgreen/stack.rs
+++ b/src/libgreen/stack.rs
@@ -11,7 +11,7 @@
 use std::rt::env::max_cached_stacks;
 use std::os::{errno, page_size, MemoryMap, MapReadable, MapWritable,
               MapNonStandardFlags, MapVirtual};
-use std::libc;
+use libc;
 
 /// A task's stack. The name "Stack" is a vestige of segmented stacks.
 pub struct Stack {