Skip to content

Commit 4fa179f

Browse files
dybucctgross35
authored andcommitted
linux(uclibc): remove conflicting records
Remove records that are already declared in top-level modules. This affects x86_64 only. There is no such supported Rust target. This change should virtually affect nobody. (backport <rust-lang#5165>) (cherry picked from commit 1d33a6e)
1 parent bc62b09 commit 4fa179f

1 file changed

Lines changed: 0 additions & 23 deletions

File tree

  • src/unix/linux_like/linux/uclibc/x86_64

src/unix/linux_like/linux/uclibc/x86_64/mod.rs

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -246,19 +246,6 @@ s! {
246246
pub _f: [c_char; 0],
247247
}
248248

249-
pub struct glob_t {
250-
// FIXME(ulibc)
251-
pub gl_pathc: size_t,
252-
pub gl_pathv: *mut *mut c_char,
253-
pub gl_offs: size_t,
254-
pub gl_flags: c_int,
255-
__unused1: Padding<*mut c_void>,
256-
__unused2: Padding<*mut c_void>,
257-
__unused3: Padding<*mut c_void>,
258-
__unused4: Padding<*mut c_void>,
259-
__unused5: Padding<*mut c_void>,
260-
}
261-
262249
pub struct cpu_set_t {
263250
// FIXME(ulibc)
264251
#[cfg(target_pointer_width = "32")]
@@ -288,16 +275,6 @@ s! {
288275
}
289276
}
290277

291-
s_no_extra_traits! {
292-
pub struct dirent {
293-
pub d_ino: crate::ino64_t,
294-
pub d_off: off64_t,
295-
pub d_reclen: u16,
296-
pub d_type: u8,
297-
pub d_name: [c_char; 256],
298-
}
299-
}
300-
301278
// constants
302279
pub const ENAMETOOLONG: c_int = 36; // File name too long
303280
pub const ENOTEMPTY: c_int = 39; // Directory not empty

0 commit comments

Comments
 (0)