From: Giles Lean Date: Thu, 25 Mar 2010 04:59:21 +0000 (-0700) Subject: syscall: bring generated files zsyscall_darwin_*.go X-Git-Tag: weekly.2010-03-30~61 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=729ccb575134b82e01dc1ebc9e4d3147c527ce72;p=gostls13.git syscall: bring generated files zsyscall_darwin_*.go up to date. No functional change, but when these files are regenerated they change, leading to noisy diffs when working in the syscall package. R=golang-dev, rsc CC=golang-dev https://golang.org/cl/705043 --- diff --git a/src/pkg/syscall/zsyscall_darwin_386.go b/src/pkg/syscall/zsyscall_darwin_386.go index 92525e3a80..6ce783cb12 100644 --- a/src/pkg/syscall/zsyscall_darwin_386.go +++ b/src/pkg/syscall/zsyscall_darwin_386.go @@ -121,6 +121,12 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) return } +func kill(pid int, signum int, posix int) (errno int) { + _, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix)) + errno = int(e1) + return +} + func fcntl(fd int, cmd int, arg int) (val int, errno int) { r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) val = int(r0) @@ -370,12 +376,6 @@ func Issetugid() (tainted bool) { return } -func kill(pid int, signum int, posix int) (errno int) { - _, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix)) - errno = int(e1) - return -} - func Kqueue() (fd int, errno int) { r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0) fd = int(r0) diff --git a/src/pkg/syscall/zsyscall_darwin_amd64.go b/src/pkg/syscall/zsyscall_darwin_amd64.go index a0fc52c85e..62985637c1 100644 --- a/src/pkg/syscall/zsyscall_darwin_amd64.go +++ b/src/pkg/syscall/zsyscall_darwin_amd64.go @@ -121,6 +121,12 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) return } +func kill(pid int, signum int, posix int) (errno int) { + _, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix)) + errno = int(e1) + return +} + func fcntl(fd int, cmd int, arg int) (val int, errno int) { r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg)) val = int(r0) @@ -370,12 +376,6 @@ func Issetugid() (tainted bool) { return } -func kill(pid int, signum int, posix int) (errno int) { - _, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix)) - errno = int(e1) - return -} - func Kqueue() (fd int, errno int) { r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0) fd = int(r0)