From 61f4ec132b424f2a7e30d70260dea7b440d7e9f3 Mon Sep 17 00:00:00 2001 From: Russ Cox <rsc@golang.org> Date: Fri, 17 Jun 2011 17:07:21 -0400 Subject: [PATCH] syscall: fix build for Sizeof change R=ken2 CC=golang-dev https://golang.org/cl/4635051 --- src/pkg/syscall/route_bsd.go | 2 +- src/pkg/syscall/syscall_bsd.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pkg/syscall/route_bsd.go b/src/pkg/syscall/route_bsd.go index 79a8793d5e..dded97b346 100644 --- a/src/pkg/syscall/route_bsd.go +++ b/src/pkg/syscall/route_bsd.go @@ -59,7 +59,7 @@ type RoutingMessage interface { sockaddr() []Sockaddr } -const anyMessageLen = unsafe.Sizeof(anyMessage{}) +const anyMessageLen = int(unsafe.Sizeof(anyMessage{})) type anyMessage struct { Msglen uint16 diff --git a/src/pkg/syscall/syscall_bsd.go b/src/pkg/syscall/syscall_bsd.go index 321d9d36bb..ec3b3167a8 100644 --- a/src/pkg/syscall/syscall_bsd.go +++ b/src/pkg/syscall/syscall_bsd.go @@ -400,7 +400,7 @@ func SetsockoptIPv6Mreq(fd, level, opt int, mreq *IPv6Mreq) (errno int) { } func SetsockoptString(fd, level, opt int, s string) (errno int) { - return setsockopt(fd, level, opt, uintptr(unsafe.Pointer(&[]byte(s)[0])), len(s)) + return setsockopt(fd, level, opt, uintptr(unsafe.Pointer(&[]byte(s)[0])), uintptr(len(s))) } //sys recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, errno int) -- 2.30.9