diff --git a/.travis.yml b/.travis.yml index d6d3ab581d95dfdb520d75e4e23bf978377799ae..dcf4c7d3df8f1c5e896f9bbe810b4803aa4609fb 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 e6d6c81562c9dba12b0b8d50e8092e00f9df50e3..e4fdcff563cc03a05351f6e88bf43f49e838fdcc 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 diff --git a/src/unix/notbsd/android/b32.rs b/src/unix/notbsd/android/b32.rs index 8ae2c2e38040dcfc31ae704744fabb793b8893df..9cc469f11405be7ba703ae57073ccf2144cf41db 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 d869b8cf618c97b02a8117a5382485f591dd2da1..45fd961581a4dd99700e5846a92dabf2cda21cc8 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 2511a1b77c82199034a136d9405bda2c2a456c35..c081ecfaf028f11d92a230346aaeecd71b8f6d98 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;