diff --git a/core/os/os_linux.odin b/core/os/os_linux.odin index 74a67f366..81ff5077a 100644 --- a/core/os/os_linux.odin +++ b/core/os/os_linux.odin @@ -26,9 +26,6 @@ Pid :: distinct i32 File_Time :: distinct u64 Socket :: distinct int -ino_t :: u64 -ino_t32 :: u32 - INVALID_HANDLE :: ~Handle(0) _Platform_Error :: linux.Errno diff --git a/core/sys/posix/dirent.odin b/core/sys/posix/dirent.odin index 79b4f87c0..254639a3f 100644 --- a/core/sys/posix/dirent.odin +++ b/core/sys/posix/dirent.odin @@ -202,33 +202,13 @@ when ODIN_OS == .Darwin { } else when ODIN_OS == .Linux { - when ODIN_ARCH == .i386 || ODIN_ARCH == .wasm32 || ODIN_ARCH == .arm32 { - dirent :: struct { - d_ino: ino_t32, /* [PSX] file number of entry */ - d_off: off_t32, /* directory offset of the next entry */ - d_reclen: c.uint16_t, /* length of this record */ + d_ino: u64, /* [PSX] file number of entry */ + d_off: i64, /* directory offset of the next entry */ + d_reclen: u16, /* length of this record */ d_type: D_Type, /* file type */ d_name: [256]c.char `fmt:"s,0"`, /* [PSX] entry name */ } - } else when ODIN_ARCH == .amd64 || ODIN_ARCH == .wasm64p32 || ODIN_ARCH == .arm64 { - - dirent :: struct { - d_ino: ino_t, /* [PSX] file number of entry */ - d_off: off_t, /* directory offset of the next entry */ - d_reclen: c.uint16_t, /* length of this record */ - d_type: D_Type, /* file type */ - d_name: [256]c.char `fmt:"s,0"`, /* [PSX] entry name */ - } - } - - dirent64 :: struct { - d_ino: ino_t, /* [PSX] file number of entry */ - d_off: off_t, /* directory offset of the next entry */ - d_reclen: c.uint16_t, /* length of this record */ - d_type: D_Type, /* file type */ - d_name: [256]c.char `fmt:"s,0"`, /* [PSX] entry name */ - } } else { #panic("posix is unimplemented for the current target") diff --git a/core/sys/posix/fcntl.odin b/core/sys/posix/fcntl.odin index 617fa408f..ca030a9a5 100644 --- a/core/sys/posix/fcntl.odin +++ b/core/sys/posix/fcntl.odin @@ -410,9 +410,6 @@ when ODIN_OS == .Darwin { l_whence: c.short, /* [PSX] flag (Whence) of starting offset */ } -} else when ODIN_OS == .Linux { - off_t :: distinct c.uint64_t - off_t32 :: distinct c.uint32_t } else { #panic("posix is unimplemented for the current target") } diff --git a/core/sys/posix/sys_stat.odin b/core/sys/posix/sys_stat.odin index 906318bb9..dd66d7d14 100644 --- a/core/sys/posix/sys_stat.odin +++ b/core/sys/posix/sys_stat.odin @@ -427,9 +427,6 @@ when ODIN_OS == .Darwin { UTIME_NOW :: -2 UTIME_OMIT :: -1 -} else when ODIN_OS == .Linux { - ino_t :: distinct u64 - ino_t32 :: distinct u32 } else { #panic("posix is unimplemented for the current target") }