From 2cc90c7e658b4fd24ac7ca02b83ac8ae5e4d8c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ty=C3=A1s=20Mustoha?= Date: Thu, 18 Feb 2016 11:56:40 +0100 Subject: [PATCH 1/2] Use 32-bit mode_t on 64-bit Android devices --- src/unix/notbsd/android/b32.rs | 2 ++ src/unix/notbsd/android/b64.rs | 2 ++ src/unix/notbsd/android/mod.rs | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/unix/notbsd/android/b32.rs b/src/unix/notbsd/android/b32.rs index 8ae2c2e3..9cc469f1 100644 --- a/src/unix/notbsd/android/b32.rs +++ b/src/unix/notbsd/android/b32.rs @@ -1,3 +1,5 @@ +pub type mode_t = u16; + s! { pub struct sigaction { pub sa_sigaction: ::sighandler_t, diff --git a/src/unix/notbsd/android/b64.rs b/src/unix/notbsd/android/b64.rs index d869b8cf..45fd9615 100644 --- a/src/unix/notbsd/android/b64.rs +++ b/src/unix/notbsd/android/b64.rs @@ -1,3 +1,5 @@ +pub type mode_t = u32; + s! { pub struct sigaction { pub sa_flags: ::c_uint, diff --git a/src/unix/notbsd/android/mod.rs b/src/unix/notbsd/android/mod.rs index 2511a1b7..c081ecfa 100644 --- a/src/unix/notbsd/android/mod.rs +++ b/src/unix/notbsd/android/mod.rs @@ -13,7 +13,6 @@ pub type ino_t = u32; pub type blkcnt_t = u32; pub type blksize_t = u32; pub type dev_t = u32; -pub type mode_t = u16; pub type nlink_t = u32; pub type useconds_t = u32; pub type socklen_t = i32; From 28a493a8cfeb12301183c6450a9a4ebd5cfcb507 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 18 Feb 2016 09:41:08 -0800 Subject: [PATCH 2/2] Move iOS back to a known good date --- .travis.yml | 4 ++-- ci/run-travis.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d6d3ab58..dcf4c7d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,10 +45,10 @@ matrix: rust: nightly - os: osx env: TARGET=i386-apple-ios - rust: nightly + rust: nightly-2016-02-12 - os: osx env: TARGET=x86_64-apple-ios - rust: nightly + rust: nightly-2016-02-12 - os: linux env: TARGET=x86_64-rumprun-netbsd DOCKER=alexcrichton/rust-libc-rumprun:2015-11-27 rust: nightly-2015-09-27 diff --git a/ci/run-travis.sh b/ci/run-travis.sh index e6d6c815..e4fdcff5 100644 --- a/ci/run-travis.sh +++ b/ci/run-travis.sh @@ -20,6 +20,10 @@ fi MAIN_TARGETS=https://static.rust-lang.org/dist DATE=$(echo $TRAVIS_RUST_VERSION | sed s/nightly-//) EXTRA_TARGETS=https://people.mozilla.org/~acrichton/libc-test/$DATE +if [ "$DATE" != "nightly" ]; then + MAIN_TARGETS=$MAIN_TARGETS/$DATE + TRAVIS_RUST_VERSION=nightly +fi install() { if [ "$TRAVIS" = "true" ]; then