diff options
| author | bors <bors@rust-lang.org> | 2016-06-10 00:19:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-10 00:19:09 -0700 |
| commit | a9234c11e00d976e69bcab95342b8af469c82d5b (patch) | |
| tree | 13fcec4f4cda88b07d10b73debab2de72d2709df /src/liballoc_jemalloc/lib.rs | |
| parent | c09d546ee512c166c2e28306ed67dcf0e3fec751 (diff) | |
| parent | adf2c432dcd3e121ccbd3904c92252b51aa110a5 (diff) | |
| download | rust-a9234c11e00d976e69bcab95342b8af469c82d5b.tar.gz rust-a9234c11e00d976e69bcab95342b8af469c82d5b.zip | |
Auto merge of #34086 - srinivasreddy:rustfmt_liballoc_jemalloc, r=nagisa
run rustfmt on liballoc_jemalloc folder
Diffstat (limited to 'src/liballoc_jemalloc/lib.rs')
| -rw-r--r-- | src/liballoc_jemalloc/lib.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs index 7651d91c06d..347e97e6ffc 100644 --- a/src/liballoc_jemalloc/lib.rs +++ b/src/liballoc_jemalloc/lib.rs @@ -39,12 +39,12 @@ use libc::{c_int, c_void, size_t}; not(target_env = "musl")), link(name = "pthread"))] #[cfg(not(cargobuild))] -extern {} +extern "C" {} // Note that the symbols here are prefixed by default on OSX and Windows (we // don't explicitly request it), and on Android and DragonFly we explicitly // request it as unprefixing cause segfaults (mismatches in allocators). -extern { +extern "C" { #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios", target_os = "dragonfly", target_os = "windows"), link_name = "je_mallocx")] @@ -136,8 +136,9 @@ pub extern "C" fn __rust_usable_size(size: usize, align: usize) -> usize { // are available. #[no_mangle] #[cfg(target_os = "android")] -pub extern fn pthread_atfork(_prefork: *mut u8, - _postfork_parent: *mut u8, - _postfork_child: *mut u8) -> i32 { +pub extern "C" fn pthread_atfork(_prefork: *mut u8, + _postfork_parent: *mut u8, + _postfork_child: *mut u8) + -> i32 { 0 } |
