Skip to content

Commit 0107464

Browse files
committed
nuttx: Resolve warnings
Fix duplicate exports for nuttx. (backport <#4773>) (cherry picked from commit 82e3aed)
1 parent fb05ec7 commit 0107464

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/unix/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ cfg_if! {
4040
extern_ty! {
4141
pub enum DIR {}
4242
}
43+
44+
#[cfg(not(target_os = "nuttx"))]
4345
pub type locale_t = *mut c_void;
4446

4547
s! {
@@ -131,6 +133,7 @@ s! {
131133
__reserved: [c_long; 16],
132134
}
133135

136+
#[cfg(not(target_os = "nuttx"))]
134137
pub struct ipv6_mreq {
135138
pub ipv6mr_multiaddr: in6_addr,
136139
#[cfg(target_os = "android")]

src/unix/nuttx/mod.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,6 @@ s! {
236236
pub ipv6mr_multiaddr: in6_addr,
237237
pub ipv6mr_interface: u32,
238238
}
239-
240-
pub struct timeval {
241-
pub tv_sec: time_t,
242-
pub tv_usec: suseconds_t,
243-
}
244239
}
245240

246241
// Reserved two pointer size for reserved area for some structures.
@@ -528,7 +523,6 @@ pub const SIGQUIT: c_int = 3;
528523
pub const SIGILL: c_int = 4;
529524
pub const SIGTRAP: c_int = 5;
530525
pub const SIGABRT: c_int = 6;
531-
pub const SIGIOT: c_int = 6;
532526
pub const SIGBUS: c_int = 7;
533527
pub const SIGFPE: c_int = 8;
534528
pub const SIGKILL: c_int = 9;

0 commit comments

Comments
 (0)