From: Russ Cox <rsc@golang.org>
Date: Fri, 24 Sep 2010 18:59:34 +0000 (-0400)
Subject: syscall: fix socketpair in syscall_bsd
X-Git-Tag: weekly.2010-09-29~55
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f33ef07f3804863b8b24dc838570d00e5c72724c;p=gostls13.git

syscall: fix socketpair in syscall_bsd

THIS WILL BREAK THE BUILD.

The z files have socketpair code in them that was
written by hand; breaking the build with this is the first
step in getting rid of that hand-written code.

R=adg
TBR=adg
CC=golang-dev
https://golang.org/cl/2197050
---

diff --git a/src/pkg/syscall/syscall_bsd.go b/src/pkg/syscall/syscall_bsd.go
index 114a963675..767537093e 100644
--- a/src/pkg/syscall/syscall_bsd.go
+++ b/src/pkg/syscall/syscall_bsd.go
@@ -323,8 +323,10 @@ func Socket(domain, typ, proto int) (fd, errno int) {
 	return
 }
 
+//sys socketpair(domain int, typ int, proto int, fd *[2]int) (errno int)
+
 func Socketpair(domain, typ, proto int) (fd [2]int, errno int) {
-	fd, errno = socketpair(domain, typ, proto)
+	errno = socketpair(domain, typ, proto, &fd)
 	return
 }