Merge pull request rust-lang#3851 from tgross35/backport-romaine

[0.2] Backport three pull requests

Author: tgross35

src/unix/linux_like/android/mod.rs

@@ -3526,6 +3526,18 @@ pub const AT_RSEQ_ALIGN: c_ulong = 28;
 pub const AT_EXECFN: c_ulong = 31;
 pub const AT_MINSIGSTKSZ: c_ulong = 51;
 
+pub const KLOG_CLOSE: ::c_int = 0;
+pub const KLOG_OPEN: ::c_int = 1;
+pub const KLOG_READ: ::c_int = 2;
+pub const KLOG_READ_ALL: ::c_int = 3;
+pub const KLOG_READ_CLEAR: ::c_int = 4;
+pub const KLOG_CLEAR: ::c_int = 5;
+pub const KLOG_CONSOLE_OFF: ::c_int = 6;
+pub const KLOG_CONSOLE_ON: ::c_int = 7;
+pub const KLOG_CONSOLE_LEVEL: ::c_int = 8;
+pub const KLOG_SIZE_UNREAD: ::c_int = 9;
+pub const KLOG_SIZE_BUFFER: ::c_int = 10;
+
 // Most `*_SUPER_MAGIC` constants are defined at the `linux_like` level; the
 // following are only available on newer Linux versions than the versions
 // currently used in CI in some configurations, so we define them here.

src/unix/solarish/mod.rs

@@ -132,6 +132,17 @@ s! {
         pub ipi6_ifindex: c_uint,
     }
 
+    pub struct in_pktinfo {
+        pub ipi_ifindex: ::c_uint,
+        pub ipi_spec_dst: ::in_addr,
+        pub ipi_addr: ::in_addr,
+    }
+
+    pub struct in6_pktinfo {
+        pub ipi6_addr: ::in6_addr,
+        pub ipi6_ifindex: ::c_uint,
+    }
+
     pub struct passwd {
         pub pw_name: *mut c_char,
         pub pw_passwd: *mut c_char,