Browse Source

more cleanup ripple

Colin Davidson 2 years ago
parent
commit
caf9716bf1
2 changed files with 14 additions and 9 deletions
  1. 9 9
      core/sys/unix/syscalls_linux.odin
  2. 5 0
      core/sys/windows/types.odin

+ 9 - 9
core/sys/unix/syscalls_linux.odin

@@ -2010,39 +2010,39 @@ sys_utimensat :: proc "contextless" (dfd: int, path: cstring, times: rawptr, fla
 }
 
 sys_socket :: proc "contextless" (domain: int, type: int, protocol: int) -> int {
-	return int(intrinsics.syscall(unix.SYS_socket, uintptr(domain), uintptr(type), uintptr(protocol)))
+	return int(intrinsics.syscall(SYS_socket, uintptr(domain), uintptr(type), uintptr(protocol)))
 }
 
 sys_connect :: proc "contextless" (sd: int, addr: rawptr, len: i32) -> int {
-	return int(intrinsics.syscall(unix.SYS_connect, uintptr(sd), uintptr(addr), uintptr(len)))
+	return int(intrinsics.syscall(SYS_connect, uintptr(sd), uintptr(addr), uintptr(len)))
 }
 
 sys_accept :: proc "contextless" (sd: int, addr: rawptr, len: rawptr) -> int {
-	return int(intrinsics.syscall(unix.SYS_accept4, uintptr(sd), uintptr(addr), uintptr(len), uintptr(0)))
+	return int(intrinsics.syscall(SYS_accept4, uintptr(sd), uintptr(addr), uintptr(len), uintptr(0)))
 }
 
 sys_listen :: proc "contextless" (sd: int, backlog: int) -> int {
-	return int(intrinsics.syscall(unix.SYS_listen, uintptr(sd), uintptr(backlog)))
+	return int(intrinsics.syscall(SYS_listen, uintptr(sd), uintptr(backlog)))
 }
 
 sys_bind :: proc "contextless" (sd: int, addr: rawptr, len: i32) -> int {
-	return int(intrinsics.syscall(unix.SYS_bind, uintptr(sd), uintptr(addr), uintptr(len)))
+	return int(intrinsics.syscall(SYS_bind, uintptr(sd), uintptr(addr), uintptr(len)))
 }
 
 sys_setsockopt :: proc "contextless" (sd: int, level: int, optname: int, optval: rawptr, optlen: i32) -> int {
-	return int(intrinsics.syscall(unix.SYS_setsockopt, uintptr(sd), uintptr(level), uintptr(optname), uintptr(optval), uintptr(optlen)))
+	return int(intrinsics.syscall(SYS_setsockopt, uintptr(sd), uintptr(level), uintptr(optname), uintptr(optval), uintptr(optlen)))
 }
 
 sys_recvfrom :: proc "contextless" (sd: int, buf: rawptr, len: uint, flags: int, addr: rawptr, alen: uintptr) -> i64 {
-	return i64(intrinsics.syscall(unix.SYS_recvfrom, uintptr(sd), uintptr(buf), uintptr(len), uintptr(flags), uintptr(addr), uintptr(alen)))
+	return i64(intrinsics.syscall(SYS_recvfrom, uintptr(sd), uintptr(buf), uintptr(len), uintptr(flags), uintptr(addr), uintptr(alen)))
 }
 
 sys_sendto :: proc "contextless" (sd: int, buf: rawptr, len: uint, flags: int, addr: rawptr, alen: i32) -> i64 {
-	return i64(intrinsics.syscall(unix.SYS_sendto, uintptr(sd), uintptr(buf), uintptr(len), uintptr(flags), uintptr(addr), uintptr(alen)))
+	return i64(intrinsics.syscall(SYS_sendto, uintptr(sd), uintptr(buf), uintptr(len), uintptr(flags), uintptr(addr), uintptr(alen)))
 }
 
 sys_shutdown :: proc "contextless" (sd: int, how: int) -> int {
-	return int(intrinsics.syscall(unix.SYS_shutdown, uintptr(sd), uintptr(how)))
+	return int(intrinsics.syscall(SYS_shutdown, uintptr(sd), uintptr(how)))
 }
 
 sys_perf_event_open :: proc "contextless" (event_attr: rawptr, pid: i32, cpu: i32, group_fd: i32, flags: u32) -> int {

+ 5 - 0
core/sys/windows/types.odin

@@ -3926,6 +3926,11 @@ ADDRINFOA :: struct {
 	ai_next: ^ADDRINFOA,
 }
 
+sockaddr :: struct {
+	sa_family: USHORT,
+	sa_data: [14]byte,
+}
+
 sockaddr_in :: struct {
 	sin_family: ADDRESS_FAMILY,
 	sin_port: u16be,