Merge pull request rust-lang#4048 from tgross35/backport-yam

[0.2] Backports

Author: tgross35

libc-test/build.rs

@@ -1056,6 +1056,9 @@ fn test_solarish(target: &str) {
             // const-ness issues
             "settimeofday" | "sethostname" => true,
 
+            // FIXME(1.0): https://github.com/rust-lang/libc/issues/1272
+            "fexecve" => true,
+
             // Solaris-different
             "getpwent_r" | "getgrent_r" | "updwtmpx" if is_illumos => true,
             "madvise" | "mprotect" if is_illumos => true,

src/unix/solarish/mod.rs

@@ -439,6 +439,11 @@ s! {
         pub aio_errno: c_int,
     }
 
+    pub struct aio_result_t {
+        pub aio_return: ::ssize_t,
+        pub aio_errno: ::c_int,
+    }
+
     pub struct exit_status {
         e_termination: c_short,
         e_exit: c_short,