diff options
| author | bors <bors@rust-lang.org> | 2016-02-20 04:48:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-20 04:48:34 +0000 |
| commit | d3ffad7a38d4a203b5c1f97db52ff45849a66b32 (patch) | |
| tree | 1b45113d2b25640d9d76077aa917acb9d5e3fff5 /src/liballoc_jemalloc | |
| parent | a212264011289885bdb8b2306a8fdd50e1f83c99 (diff) | |
| parent | 78f6431002b81dc7ef3001965192e6fbfff34d7a (diff) | |
| download | rust-d3ffad7a38d4a203b5c1f97db52ff45849a66b32.tar.gz rust-d3ffad7a38d4a203b5c1f97db52ff45849a66b32.zip | |
Auto merge of #31777 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #31721, #31737, #31741, #31750, #31763, #31764, #31765, #31775 - Failed merges:
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/lib.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs index bda001eb4f4..c96d303e6bb 100644 --- a/src/liballoc_jemalloc/lib.rs +++ b/src/liballoc_jemalloc/lib.rs @@ -45,19 +45,19 @@ extern {} // explicitly request it), and on Android we explicitly request it as // unprefixing cause segfaults (mismatches in allocators). extern { - #[cfg_attr(any(target_os = "macos", target_os = "android"), + #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios"), link_name = "je_mallocx")] fn mallocx(size: size_t, flags: c_int) -> *mut c_void; - #[cfg_attr(any(target_os = "macos", target_os = "android"), + #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios"), link_name = "je_rallocx")] fn rallocx(ptr: *mut c_void, size: size_t, flags: c_int) -> *mut c_void; - #[cfg_attr(any(target_os = "macos", target_os = "android"), + #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios"), link_name = "je_xallocx")] fn xallocx(ptr: *mut c_void, size: size_t, extra: size_t, flags: c_int) -> size_t; - #[cfg_attr(any(target_os = "macos", target_os = "android"), + #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios"), link_name = "je_sdallocx")] fn sdallocx(ptr: *mut c_void, size: size_t, flags: c_int); - #[cfg_attr(any(target_os = "macos", target_os = "android"), + #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios"), link_name = "je_nallocx")] fn nallocx(size: size_t, flags: c_int) -> size_t; } |