Merge pull request #46 from alexcrichton/ni-maxhost

Add NI_MAXHOST

7 files changed, 18 insertions, 13 deletions

diff --git a/ci/run-travis.sh b/ci/run-travis.sh
index 975accb664..1e4b144cbe 100644
--- a/ci/run-travis.sh
+++ b/ci/run-travis.sh
@@ -54,7 +54,7 @@ case "$TARGET" in
 cp -r /checkout/* .
 mkdir .cargo
 cp ci/cargo-config .cargo/config
-sh ci/run.sh $TARGET
+exec sh ci/run.sh $TARGET
 "
     exec docker run \
       --entrypoint bash \
diff --git a/ci/run.sh b/ci/run.sh
index 6dd177bffa..635422cd75 100644
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -22,7 +22,8 @@ case "$TARGET" in
     emulator @arm-18 -no-window &
     adb wait-for-device
     adb push libc-test/target/$TARGET/debug/libc-test /data/libc-test
-    adb shell /data/libc-test
+    adb shell /data/libc-test 2>&1 | tee out
+    grep "^PASSED .* tests" out
     ;;
 
   arm-unknown-linux-gnueabihf)
diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs
index 91d20320db..87c7ec053a 100644
--- a/src/unix/bsd/mod.rs
+++ b/src/unix/bsd/mod.rs
@@ -107,6 +107,8 @@ pub const FD_SETSIZE: usize = 1024;
 pub const ST_RDONLY: ::c_ulong = 1;
 pub const ST_NOSUID: ::c_ulong = 2;
 
+pub const NI_MAXHOST: ::socklen_t = 1025;
+
 f! {
     pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () {
         let fd = fd as usize;
diff --git a/src/unix/notbsd/android/mod.rs b/src/unix/notbsd/android/mod.rs
index 2ffb201394..2c01b25196 100644
--- a/src/unix/notbsd/android/mod.rs
+++ b/src/unix/notbsd/android/mod.rs
@@ -317,6 +317,7 @@ pub const O_NOCTTY: ::c_int = 256;
 pub const O_NONBLOCK: ::c_int = 2048;
 pub const O_SYNC: ::c_int = 0x1000;
 
+pub const NI_MAXHOST: ::size_t = 1025;
 
 f! {
     pub fn sigemptyset(set: *mut sigset_t) -> ::c_int {
diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs
index 62e2262113..17a40baad8 100644
--- a/src/unix/notbsd/linux/mod.rs
+++ b/src/unix/notbsd/linux/mod.rs
@@ -321,17 +321,6 @@ extern {
 }
 
 cfg_if! {
-    if #[cfg(any(target_env = "musl"))] {
-        pub const PTHREAD_STACK_MIN: ::size_t = 2048;
-    } else if #[cfg(any(target_arch = "arm", target_arch = "x86",
-                        target_arch = "x86_64"))] {
-        pub const PTHREAD_STACK_MIN: ::size_t = 16384;
-    } else {
-        pub const PTHREAD_STACK_MIN: ::size_t = 131072;
-    }
-}
-
-cfg_if! {
     if #[cfg(target_env = "musl")] {
         mod musl;
         pub use self::musl::*;
diff --git a/src/unix/notbsd/linux/musl.rs b/src/unix/notbsd/linux/musl.rs
index 7884244ddd..31f97f64fe 100644
--- a/src/unix/notbsd/linux/musl.rs
+++ b/src/unix/notbsd/linux/musl.rs
@@ -4,6 +4,8 @@ pub const FOPEN_MAX: ::c_uint = 1000;
 pub const POSIX_MADV_DONTNEED: ::c_int = 0;
 pub const O_ACCMODE: ::c_int = 0o10000003;
 pub const RUSAGE_CHILDREN: ::c_int = 1;
+pub const NI_MAXHOST: ::socklen_t = 255;
+pub const PTHREAD_STACK_MIN: ::size_t = 2048;
 
 extern {
     pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
diff --git a/src/unix/notbsd/linux/notmusl.rs b/src/unix/notbsd/linux/notmusl.rs
index 5f23d80f14..8a7594f515 100644
--- a/src/unix/notbsd/linux/notmusl.rs
+++ b/src/unix/notbsd/linux/notmusl.rs
@@ -22,6 +22,16 @@ pub const RUSAGE_THREAD: ::c_int = 1;
 pub const O_ACCMODE: ::c_int = 3;
 pub const RUSAGE_CHILDREN: ::c_int = -1;
 pub const ST_RELATIME: ::c_ulong = 4096;
+pub const NI_MAXHOST: ::socklen_t = 1025;
+
+cfg_if! {
+    if #[cfg(any(target_arch = "arm", target_arch = "x86",
+                        target_arch = "x86_64"))] {
+        pub const PTHREAD_STACK_MIN: ::size_t = 16384;
+    } else {
+        pub const PTHREAD_STACK_MIN: ::size_t = 131072;
+    }
+}
 
 extern {
     pub fn sysctl(name: *mut ::c_int,