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/rt | |
| 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/rt')
| -rw-r--r-- | src/libstd/rt/unwind/gcc.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libstd/rt/unwind/gcc.rs b/src/libstd/rt/unwind/gcc.rs index 87941e79b2f..59fc8df6107 100644 --- a/src/libstd/rt/unwind/gcc.rs +++ b/src/libstd/rt/unwind/gcc.rs @@ -251,12 +251,11 @@ pub mod eabi { use rt::libunwind as uw; use libc::{c_void, c_int}; - #[repr(C)] - pub struct EXCEPTION_RECORD; - #[repr(C)] - pub struct CONTEXT; - #[repr(C)] - pub struct DISPATCHER_CONTEXT; + // Fake definitions; these are actually complicated structs, + // but we don't use the contents here. + pub type EXCEPTION_RECORD = c_void; + pub type CONTEXT = c_void; + pub type DISPATCHER_CONTEXT = c_void; #[repr(C)] #[derive(Copy, Clone)] |