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

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

src/librustdoc/flock.rs

@@ -18,13 +18,14 @@
 
 pub use self::imp::Lock;
 
+
 #[cfg(unix)]
 mod imp {
-    use std::libc;
+    use libc;
 
     #[cfg(target_os = "linux")]
     mod os {
-        use std::libc;
+        use libc;
 
         pub struct flock {
             pub l_type: libc::c_short,
@@ -45,7 +46,7 @@ mod imp {
 
     #[cfg(target_os = "freebsd")]
     mod os {
-        use std::libc;
+        use libc;
 
         pub struct flock {
             pub l_start: libc::off_t,
@@ -64,7 +65,7 @@ mod imp {
 
     #[cfg(target_os = "macos")]
     mod os {
-        use std::libc;
+        use libc;
 
         pub struct flock {
             pub l_start: libc::off_t,
@@ -132,7 +133,7 @@ mod imp {
 
 #[cfg(windows)]
 mod imp {
-    use std::libc;
+    use libc;
     use std::mem;
     use std::os::win32::as_utf16_p;
     use std::os;

src/librustdoc/html/markdown.rs

@@ -26,10 +26,10 @@
 
 #![allow(non_camel_case_types)]
 
+use libc;
 use std::cast;
 use std::fmt;
 use std::io;
-use std::libc;
 use std::local_data;
 use std::mem;
 use std::str;

src/librustdoc/lib.rs

@@ -26,6 +26,7 @@ extern crate testing = "test";
 extern crate time;
 #[phase(syntax, link)]
 extern crate log;
+extern crate libc;
 
 use std::local_data;
 use std::io;