qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 23:10:09 -07:00
Code Releases Activity

net: fix the build even harder

Browse Source 
Should fix nacl.

Follow-up to
https://golang.org/cl/17936 (fix race) and
https://golang.org/cl/17914 (fix build) for
https://golang.org/cl/16953 (broke the build)

Third time's a charm.

Change-Id: I23930d5cff4235209546952ce2231f165ab5bf8a
Reviewed-on: https://go-review.googlesource.com/17939
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Brad Fitzpatrick 2015-12-17 18:14:52 +00:00
parent d270a6794b
commit 807c6c58fc
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/dnsclient_unix.go
View File

@ -29,6 +29,8 @@ type dnsDialer interface {
dialDNS(string, string) (dnsConn, error)
}
var testHookDNSDialer = func(d time.Duration) dnsDialer { return &Dialer{Timeout: d} }
// A dnsConn represents a DNS transport endpoint.
type dnsConn interface {
io.Closer

6
src/net/hook_unix.go
View File

@ -6,14 +6,10 @@
package net
import (
"syscall"
"time"
)
import "syscall"
var (
testHookDialChannel = func() {} // see golang.org/issue/5349
testHookDNSDialer = func(d time.Duration) dnsDialer { return &Dialer{Timeout: d} }
// Placeholders for socket system calls.
socketFunc func(int, int, int) (int, error) = syscall.Socket