net: fix the build even harder

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>

diff --git a/src/net/dnsclient_unix.go b/src/net/dnsclient_unix.go
index 15a4081835d7632a296ffcd0d280573b60b05cd4..17188f0024c0c6a1e2244426ea36acba9387a25b 100644 (file)
--- a/src/net/dnsclient_unix.go
+++ b/src/net/dnsclient_unix.go
@@ -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

diff --git a/src/net/hook_unix.go b/src/net/hook_unix.go
index 15c6a18a8a89dc993aa49bf4d1d7f1a182df5ddb..361ca5980c38b24abc526e8a346fa6c2c0114efa 100644 (file)
--- a/src/net/hook_unix.go
+++ b/src/net/hook_unix.go
@@ -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