about summary refs log tree commit diff
path: root/src/libnative
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-05-10 23:21:44 -0700
committerbors <bors@rust-lang.org>2014-05-10 23:21:44 -0700
commitadb8b0b230d5e5c79b4f873825b3d3cff8d1bc8f (patch)
tree770b50ee78ec3b79feeaf70f73f50f1166bed980 /src/libnative
parent11571cd9c1cde63c3b46ca65e608b84647785ac8 (diff)
parent81fadbbc4182c5a34e0d2ff698471abfc1ec0e33 (diff)
downloadrust-adb8b0b230d5e5c79b4f873825b3d3cff8d1bc8f.tar.gz
rust-adb8b0b230d5e5c79b4f873825b3d3cff8d1bc8f.zip
auto merge of #14006 : thestinger/rust/jemalloc, r=alexcrichton
Closes #11807
Diffstat (limited to 'src/libnative')
-rw-r--r--src/libnative/io/file_win32.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libnative/io/file_win32.rs b/src/libnative/io/file_win32.rs
index 42e5ad062ee..5fc9e506cf2 100644
--- a/src/libnative/io/file_win32.rs
+++ b/src/libnative/io/file_win32.rs
@@ -339,7 +339,7 @@ pub fn mkdir(p: &CString, _mode: io::FilePermission) -> IoResult<()> {
 }
 
 pub fn readdir(p: &CString) -> IoResult<Vec<Path>> {
-    use std::rt::global_heap::malloc_raw;
+    use std::rt::libc_heap::malloc_raw;
 
     fn prune(root: &CString, dirs: Vec<Path>) -> Vec<Path> {
         let root = unsafe { CString::new(root.with_ref(|p| p), false) };