diff options
| author | bors <bors@rust-lang.org> | 2015-07-24 02:40:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-07-24 02:40:42 +0000 |
| commit | 68e0d13bfdcb83bfd4232ad33a1a7e271bff8994 (patch) | |
| tree | e9f178bd17443ca3edd27bd6c96ef8b20eb7a025 /src/libstd/thread | |
| parent | 69ca0125641db798f072f9a0f5d838686255eb37 (diff) | |
| parent | 6fa17b43d351ed4f9093cf80f4044d1208044241 (diff) | |
| download | rust-68e0d13bfdcb83bfd4232ad33a1a7e271bff8994.tar.gz rust-68e0d13bfdcb83bfd4232ad33a1a7e271bff8994.zip | |
Auto merge of #26583 - eefriedman:lint-ffi, r=nrc
Makes the lint a bit more accurate, and improves the quality of the diagnostic messages by explicitly returning an error message.
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index e2873601a7b..11b375dcce2 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -335,13 +335,13 @@ mod imp { #[linkage = "extern_weak"] static __dso_handle: *mut u8; #[linkage = "extern_weak"] - static __cxa_thread_atexit_impl: *const (); + static __cxa_thread_atexit_impl: *const libc::c_void; } if !__cxa_thread_atexit_impl.is_null() { type F = unsafe extern fn(dtor: unsafe extern fn(*mut u8), arg: *mut u8, dso_handle: *mut u8) -> libc::c_int; - mem::transmute::<*const (), F>(__cxa_thread_atexit_impl) + mem::transmute::<*const libc::c_void, F>(__cxa_thread_atexit_impl) (dtor, t, &__dso_handle as *const _ as *mut _); return } |