summaryrefslogtreecommitdiff
path: root/src/unix/bsd/freebsdlike/freebsd/x86.rs
diff options
context:
space:
mode:
authorgnzlbg <gonzalobg88@gmail.com>2019-02-07 11:37:21 +0100
committergnzlbg <gonzalobg88@gmail.com>2019-02-07 13:44:32 +0100
commita17a91cdbf13a43af4e24c0f5498ff6a5e6271c5 (patch)
tree61e87c1bc93fea6149fa4ac1201059aee3249e09 /src/unix/bsd/freebsdlike/freebsd/x86.rs
parent8f1acf4643293a22c3888423eb9d48d0ee351fa7 (diff)
downloadrust-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/unix/bsd/freebsdlike/freebsd/x86.rs')
-rw-r--r--src/unix/bsd/freebsdlike/freebsd/x86.rs11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/unix/bsd/freebsdlike/freebsd/x86.rs b/src/unix/bsd/freebsdlike/freebsd/x86.rs
index 2eaeec7660..b31e335361 100644
--- a/src/unix/bsd/freebsdlike/freebsd/x86.rs
+++ b/src/unix/bsd/freebsdlike/freebsd/x86.rs
@@ -34,5 +34,12 @@ s! {
}
// should be pub(crate), but that requires Rust 1.18.0
-#[doc(hidden)]
-pub const _ALIGNBYTES: usize = mem::size_of::<::c_long>() - 1;
+cfg_if! {
+ if #[cfg(libc_const_size_of)] {
+ #[doc(hidden)]
+ pub const _ALIGNBYTES: usize = mem::size_of::<::c_long>() - 1;
+ } else {
+ #[doc(hidden)]
+ pub const _ALIGNBYTES: usize = 8 - 1;
+ }
+}