diff options
| author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-09-20 21:49:12 +0000 |
|---|---|---|
| committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-09-20 21:49:12 +0000 |
| commit | c9c81ef3c667aaa14c498a5449ec6d134b4b66ff (patch) | |
| tree | 0ac440db6513ee01deb5e5dc6142769d1e5b7b2d /libgo/go/net/hook_unix.go | |
| parent | 12cdcb9d74f55c165366ca1b1eeec013a0ce72ef (diff) | |
| parent | 891196d7325e4c55d92d5ac5cfe7161c4f36c0ce (diff) | |
| download | gcc-fortran-dev.tar.gz | |
Merge from trunk (r239915 to r240230)fortran-dev
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/fortran-dev@240290 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/net/hook_unix.go')
| -rw-r--r-- | libgo/go/net/hook_unix.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libgo/go/net/hook_unix.go b/libgo/go/net/hook_unix.go index 361ca5980c3..cf52567fcfd 100644 --- a/libgo/go/net/hook_unix.go +++ b/libgo/go/net/hook_unix.go @@ -9,7 +9,8 @@ package net import "syscall" var ( - testHookDialChannel = func() {} // see golang.org/issue/5349 + testHookDialChannel = func() {} // for golang.org/issue/5349 + testHookCanceledDial = func() {} // for golang.org/issue/16523 // Placeholders for socket system calls. socketFunc func(int, int, int) (int, error) = syscall.Socket |