Merge pull request rust-lang#193 from alexcrichton/fix-ios

Fix iOS builds

Author: alexcrichton

.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

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

src/unix/notbsd/android/b32.rs

@@ -1,3 +1,5 @@
+pub type mode_t = u16;
+
 s! {
     pub struct sigaction {
         pub sa_sigaction: ::sighandler_t,

src/unix/notbsd/android/b64.rs

@@ -1,3 +1,5 @@
+pub type mode_t = u32;
+
 s! {
     pub struct sigaction {
         pub sa_flags: ::c_uint,

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;