Consolidate bsd and illumos ioctl

nix-rust · Mar 5, 2021 · 270c317 · 270c317
1 parent b7d19fe
commit 270c317
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 99 deletions.
diff --git 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;

diff --git a/src/sys/ioctl/illumos.rs b/src/sys/ioctl/illumos.rs
diff --git a/src/sys/ioctl/mod.rs b/src/sys/ioctl/mod.rs
@@ -232,6 +232,7 @@ pub use self::linux::*;
 
 #[cfg(any(target_os = "dragonfly",
           target_os = "freebsd",
+          target_os = "illumos",
           target_os = "ios",
           target_os = "macos",
           target_os = "netbsd",
@@ -241,19 +242,13 @@ mod bsd;
 
 #[cfg(any(target_os = "dragonfly",
           target_os = "freebsd",
+          target_os = "illumos",
           target_os = "ios",
           target_os = "macos",
           target_os = "netbsd",
           target_os = "openbsd"))]
 pub use self::bsd::*;
 
-#[cfg(target_os = "illumos")]
-#[macro_use]
-mod illumos;
-
-#[cfg(target_os = "illumos")]
-pub use self::illumos::*;
-
 /// Convert raw ioctl return value to a Nix result
 #[macro_export]
 #[doc(hidden)]