Moved dirent to generic.rs

rust-lang · Sep 24, 2023 · 53c6b31 · 53c6b31
1 parent b9c8323
commit 53c6b31
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 18 deletions.
diff --git a/src/unix/newlib/aarch64/mod.rs b/src/unix/newlib/aarch64/mod.rs
@@ -51,4 +51,4 @@ pub const MSG_WAITALL: ::c_int = 0;
 pub const MSG_MORE: ::c_int = 0;
 pub const MSG_NOSIGNAL: ::c_int = 0;
 
-pub use crate::unix::newlib::generic::{sigset_t, stat};
+pub use crate::unix::newlib::generic::{dirent, sigset_t, stat};
diff --git a/src/unix/newlib/arm/mod.rs b/src/unix/newlib/arm/mod.rs
@@ -53,4 +53,4 @@ pub const MSG_WAITALL: ::c_int = 0;
 pub const MSG_MORE: ::c_int = 0;
 pub const MSG_NOSIGNAL: ::c_int = 0;
 
-pub use crate::unix::newlib::generic::{sigset_t, stat};
+pub use crate::unix::newlib::generic::{dirent, sigset_t, stat};
diff --git a/src/unix/newlib/dirent.rs b/src/unix/newlib/dirent.rs
diff --git a/src/unix/newlib/espidf/mod.rs b/src/unix/newlib/espidf/mod.rs
@@ -107,4 +107,4 @@ extern "C" {
     pub fn eventfd(initval: ::c_uint, flags: ::c_int) -> ::c_int;
 }
 
-pub use crate::unix::newlib::generic::{sigset_t, stat};
+pub use crate::unix::newlib::generic::{dirent, sigset_t, stat};
diff --git a/src/unix/newlib/generic.rs b/src/unix/newlib/generic.rs
@@ -24,4 +24,10 @@ s! {
         pub st_blocks: ::blkcnt_t,
         pub st_spare4: [::c_long; 2usize],
     }
+
+    pub struct dirent {
+        pub d_ino: ::ino_t,
+        pub d_type: ::c_uchar,
+        pub d_name: [::c_char; 256usize],
+    }
 }
diff --git a/src/unix/newlib/horizon/mod.rs b/src/unix/newlib/horizon/mod.rs
@@ -266,3 +266,5 @@ extern "C" {
 
     pub fn gethostid() -> ::c_long;
 }
+
+pub use crate::unix::newlib::generic::dirent;
diff --git a/src/unix/newlib/mod.rs b/src/unix/newlib/mod.rs
@@ -786,13 +786,6 @@ cfg_if! {
     }
 }
 
-cfg_if! {
-    if #[cfg(not(target_os = "vita"))] {
-        mod dirent;
-        pub use self::dirent::*;
-    }
-}
-
 cfg_if! {
     if #[cfg(libc_align)] {
         #[macro_use]

diff --git a/src/unix/newlib/powerpc/mod.rs b/src/unix/newlib/powerpc/mod.rs
@@ -5,7 +5,7 @@ pub type wchar_t = ::c_int;
 pub type c_long = i32;
 pub type c_ulong = u32;
 
-pub use crate::unix::newlib::generic::{sigset_t, stat};
+pub use crate::unix::newlib::generic::{dirent, sigset_t, stat};
 
 // the newlib shipped with devkitPPC does not support the following components:
 // - sockaddr