From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 28 Jan 2013 17:37:10 +0000 (-0800)
Subject: net: fix windows build
X-Git-Tag: go1.1rc2~1280
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2cd5b014544fd46a015acf3a37aea916bba19811;p=gostls13.git

net: fix windows build

R=golang-dev, minux.ma
CC=golang-dev
https://golang.org/cl/7229050
---

diff --git a/src/pkg/net/sock_windows.go b/src/pkg/net/sock_windows.go
index cce6181c9e..fc5d9e5de2 100644
--- a/src/pkg/net/sock_windows.go
+++ b/src/pkg/net/sock_windows.go
@@ -41,3 +41,14 @@ func listenerSockaddr(s syscall.Handle, f int, la syscall.Sockaddr, toAddr func(
 	}
 	return la, nil
 }
+
+func sysSocket(f, t, p int) (syscall.Handle, error) {
+	// See ../syscall/exec_unix.go for description of ForkLock.
+	syscall.ForkLock.RLock()
+	s, err := syscall.Socket(f, t, p)
+	if err == nil {
+		syscall.CloseOnExec(s)
+	}
+	syscall.ForkLock.RUnlock()
+	return s, err
+}