summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-09-21 17:34:15 +0000
committerbors <bors@rust-lang.org>2019-09-21 17:34:15 +0000
commit74c4b1508a187801ec9185c57150d17d77897b9c (patch)
tree974803c87666b8646d7b5001f2b43416c610dec9
parentcfa6c2d7ca5c1bb9959b13f7dc8be7e9e327b1b1 (diff)
parent9b97095acc13ba52164eb1d00a0c044ec28d9978 (diff)
downloadrust-libc-74c4b1508a187801ec9185c57150d17d77897b9c.tar.gz
Auto merge of #1529 - gnzlbg:max_align_freebsd10, r=gnzlbg
Skip max_align_t in FreeBSD10 This error was able to land because FreeBSD10 is not checked by bors yet (see: RCS PR: https://github.com/rust-lang/rust-central-station/pull/481) .
-rw-r--r--libc-test/build.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/libc-test/build.rs b/libc-test/build.rs
index 73ac02decb..d6982fc952 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -1646,6 +1646,9 @@ fn test_freebsd(target: &str) {
// `mmsghdr` is not available in FreeBSD 10
"mmsghdr" if Some(10) == freebsd_ver => true,
+ // `max_align_t` is not available in FreeBSD 10
+ "max_align_t" if Some(10) == freebsd_ver => true,
+
_ => false,
}
});