about summary refs log tree commit diff
path: root/src/libcollections
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/libcollections
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/libcollections')
-rw-r--r--src/libcollections/hashmap.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libcollections/hashmap.rs b/src/libcollections/hashmap.rs
index 7a51fca6cd5..8090b2cea8c 100644
--- a/src/libcollections/hashmap.rs
+++ b/src/libcollections/hashmap.rs
@@ -30,11 +30,12 @@ use std::result::{Ok, Err};
 use std::slice::ImmutableVector;
 
 mod table {
+    extern crate libc;
+
     use std::clone::Clone;
     use std::cmp::Eq;
     use std::hash::{Hash, Hasher};
     use std::kinds::marker;
-    use std::libc;
     use std::num::CheckedMul;
     use std::option::{Option, Some, None};
     use std::prelude::Drop;