diff options
| author | gnzlbg <gonzalobg88@gmail.com> | 2019-02-07 11:37:21 +0100 |
|---|---|---|
| committer | gnzlbg <gonzalobg88@gmail.com> | 2019-02-07 13:44:32 +0100 |
| commit | a17a91cdbf13a43af4e24c0f5498ff6a5e6271c5 (patch) | |
| tree | 61e87c1bc93fea6149fa4ac1201059aee3249e09 /src/sgx.rs | |
| parent | 8f1acf4643293a22c3888423eb9d48d0ee351fa7 (diff) | |
| download | rust-libc-a17a91cdbf13a43af4e24c0f5498ff6a5e6271c5.tar.gz | |
Fix build on all platforms
This PR fixes the build on all platforms and all Rust version down to the
minimum Rust version supported by libc: Rust 1.13.0.
The `build.rs` is extended with logic to detect the newer Rust features used by
`libc` since Rust 1.13.0:
* Rust 1.19.0: `untagged_unions`. APIs using untagged unions are gated on
`cfg(libc_unions)` and not available on older Rust versions.
* Rust 1.25.0: `repr(align)`. Because `repr(align)` cannot be parsed by older
Rust versions, all uses of `repr(align)` are split into `align.rs` and
`no_align.rs` modules, which are gated on the `cfg(libc_align)` at the top
level. These modules sometimes contain macros that are expanded at the top
level to avoid privacy issues (`pub(crate)` is not available in older Rust
versions). Closes #1242 .
* Rust : `const` `mem::size_of`. These uses are worked around with hardcoded
constants on older Rust versions.
Also, `repr(packed)` structs cannot automatically `derive()` some traits like
`Debug`. These have been moved into `s_no_extra_traits!` and the lint of missing
`Debug` implementations on public items is silenced for these. We can manually
implement the `extra_traits` for these in a follow up PR. This is tracked
in #1243. Also, `extra_traits` does not enable `align` manually anymore.
Since `f64::to_bits` is not available in older Rust versions, its usage
has been replaced with a `transmute` to an `u64` which is what that method
does under the hood.
Closes #1232 .
Diffstat (limited to 'src/sgx.rs')
| -rw-r--r-- | src/sgx.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sgx.rs b/src/sgx.rs index 1d5ca21292..8a69ad36e4 100644 --- a/src/sgx.rs +++ b/src/sgx.rs @@ -36,14 +36,15 @@ pub const INT_MIN: c_int = -2147483648; pub const INT_MAX: c_int = 2147483647; cfg_if! { - if #[cfg(core_cvoid)] { - pub use core::ffi::c_void; + if #[cfg(libc_core_cvoid)] { + pub use ::ffi::c_void; } else { // Use repr(u8) as LLVM expects `void*` to be the same as `i8*` to help // enable more optimization opportunities around it recognizing things // like malloc/free. #[repr(u8)] #[allow(missing_copy_implementations)] + #[allow(missing_debug_implementations)] pub enum c_void { // Two dummy variants so the #[repr] attribute can be used. #[doc(hidden)] |