diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-21 23:24:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-21 23:24:39 +0000 |
| commit | fde9ebc6060ba7d5f0f49bafe82f332003ea9605 (patch) | |
| tree | 09c410385c727ac6f9e9bfae71077901f5edfb6d /src/sys/ioctl/bsd.rs | |
| parent | 7b3129a194ecbf3e5f99f30ff26ab0e6fa7f183d (diff) | |
| parent | d444f1bcf20b29d0ec69e30046c71d005a2b9d72 (diff) | |
| download | nix-fde9ebc6060ba7d5f0f49bafe82f332003ea9605.zip | |
Merge #1394
1394: illumos and Solaris support r=asomers a=jasonbking
Adds support for the illumos target as well as improvements in the existing Solaris support.
Co-authored-by: Dominik Hassler <hadfl@omnios.org>
Co-authored-by: Joshua M. Clulow <josh@sysmgr.org>
Co-authored-by: Jason King <jason.brian.king@gmail.com>
Diffstat (limited to 'src/sys/ioctl/bsd.rs')
| -rw-r--r-- | src/sys/ioctl/bsd.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/sys/ioctl/bsd.rs b/src/sys/ioctl/bsd.rs index f39c0eb6..4ce4d332 100644 --- a/src/sys/ioctl/bsd.rs +++ b/src/sys/ioctl/bsd.rs @@ -1,6 +1,12 @@ /// The datatype used for the ioctl number #[doc(hidden)] +#[cfg(not(target_os = "illumos"))] pub type ioctl_num_type = ::libc::c_ulong; + +#[doc(hidden)] +#[cfg(target_os = "illumos")] +pub type ioctl_num_type = ::libc::c_int; + /// The datatype used for the 3rd argument #[doc(hidden)] pub type ioctl_param_type = ::libc::c_int; @@ -12,6 +18,7 @@ mod consts { #[doc(hidden)] pub const OUT: ioctl_num_type = 0x4000_0000; #[doc(hidden)] + #[allow(overflowing_literals)] pub const IN: ioctl_num_type = 0x8000_0000; #[doc(hidden)] pub const INOUT: ioctl_num_type = IN|OUT; |