diff options
| author | marcs-feh <marcosfehlauer@protonmail.com> | 2024-01-26 16:17:09 -0300 |
|---|---|---|
| committer | marcs-feh <marcosfehlauer@protonmail.com> | 2024-01-26 16:23:16 -0300 |
| commit | d931bfcf83894b65d6db3bc846110efb400ab4a1 (patch) | |
| tree | 71b7893a1cf23612b61ac8080514bb160a327dfd /core/sys/linux | |
| parent | b58627490b63e5c4055238c99fd2cde635abd358 (diff) | |
resolve conflict
Diffstat (limited to 'core/sys/linux')
| -rw-r--r-- | core/sys/linux/sys.odin | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/sys/linux/sys.odin b/core/sys/linux/sys.odin index 74a172c75..7f3c157b3 100644 --- a/core/sys/linux/sys.odin +++ b/core/sys/linux/sys.odin @@ -224,7 +224,7 @@ rt_sigprocmask :: proc "contextless" (mask_kind: Sig_Mask_Kind, new_set: ^Sig_Se code value instead of a memory address depending on the request type. Available since Linux 1.0. */ -ioctl :: proc "contextless" (fd: Fd, request: u64, arg: u64) -> (uintptr) { +ioctl :: proc "contextless" (fd: Fd, request: i32, arg: uintptr) -> (uintptr) { ret := syscall(SYS_ioctl, fd, request, arg) return uintptr(ret) } |