diff options
| author | bors <bors@rust-lang.org> | 2015-03-13 17:49:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-13 17:49:15 +0000 |
| commit | 9eb69abad8ffbce840e7dc7038ddea434dc987f1 (patch) | |
| tree | 217b64e9e1271d2be83dfb091044432928861520 /src/liballoc | |
| parent | ee7696383f3423cdd17373ff9e75c01acd8e3417 (diff) | |
| parent | 40b64645fecbee4e11da1ea4328c1b1ab4b9b8a0 (diff) | |
| download | rust-9eb69abad8ffbce840e7dc7038ddea434dc987f1.tar.gz rust-9eb69abad8ffbce840e7dc7038ddea434dc987f1.zip | |
Auto merge of #23337 - Manishearth:rollup, r=Manishearth
r? @Manishearth
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/heap.rs | 1 | ||||
| -rw-r--r-- | src/liballoc/lib.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs index 3b93171386a..f9936b7a16a 100644 --- a/src/liballoc/heap.rs +++ b/src/liballoc/heap.rs @@ -198,6 +198,7 @@ mod imp { extern {} extern { + #[allocator] fn je_mallocx(size: size_t, flags: c_int) -> *mut c_void; fn je_rallocx(ptr: *mut c_void, size: size_t, flags: c_int) -> *mut c_void; fn je_xallocx(ptr: *mut c_void, size: size_t, extra: size_t, flags: c_int) -> size_t; diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 5c9a42a8a71..34c0686fe37 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -69,6 +69,7 @@ #![feature(no_std)] #![no_std] +#![feature(allocator)] #![feature(lang_items, unsafe_destructor)] #![feature(box_syntax)] #![feature(optin_builtin_traits)] |