From d931bfcf83894b65d6db3bc846110efb400ab4a1 Mon Sep 17 00:00:00 2001
From: marcs-feh <marcosfehlauer@protonmail.com>
Date: Fri, 26 Jan 2024 16:17:09 -0300
Subject: [PATCH] resolve conflict

---
 core/sys/linux/sys.odin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
 }