diff --git a/src/unix/newlib/aarch64/mod.rs b/src/unix/newlib/aarch64/mod.rs index d686b3692d86d..2b4713c9a364e 100644 --- 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 index f644349cb997f..23b75977e63ec 100644 --- 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 deleted file mode 100644 index 664ca066e8947..0000000000000 --- a/src/unix/newlib/dirent.rs +++ /dev/null @@ -1,7 +0,0 @@ -s! { - 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/espidf/mod.rs b/src/unix/newlib/espidf/mod.rs index 804cd66454f46..409d7ad9bd784 100644 --- 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 index db7797f17c297..e45413a7a9e2c 100644 --- 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 index bcb93ad9df4f1..9c70f7b031b63 100644 --- 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 index faa87659b6030..a572cc38bfda9 100644 --- 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 index 6bed1ce27acbf..10faadbdf8c0a 100644 --- 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