diff options
| -rw-r--r-- | libgo/Makefile.am | 2 | ||||
| -rw-r--r-- | libgo/Makefile.in | 2 | ||||
| -rw-r--r-- | libgo/go/net/tcpsockopt_solaris.go | 25 |
3 files changed, 2 insertions, 27 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 052cded183b..92fe175cd78 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -752,7 +752,7 @@ if LIBGO_IS_DARWIN go_net_tcpsockopt_file = go/net/tcpsockopt_darwin.go else if LIBGO_IS_SOLARIS -go_net_tcpsockopt_file = go/net/tcpsockopt_solaris.go +go_net_tcpsockopt_file = go/net/tcpsockopt_darwin.go else go_net_tcpsockopt_file = go/net/tcpsockopt_unix.go endif diff --git a/libgo/Makefile.in b/libgo/Makefile.in index e633b60ecf3..edbc2e1ff8a 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -996,7 +996,7 @@ go_mime_files = \ @LIBGO_IS_LINUX_FALSE@go_net_cloexec_file = go/net/sys_cloexec.go @LIBGO_IS_LINUX_TRUE@go_net_cloexec_file = go/net/sock_cloexec.go @LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_OPENBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_tcpsockopt_file = go/net/tcpsockopt_unix.go -@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_OPENBSD_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_tcpsockopt_file = go/net/tcpsockopt_solaris.go +@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_OPENBSD_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_tcpsockopt_file = go/net/tcpsockopt_darwin.go @LIBGO_IS_DARWIN_TRUE@@LIBGO_IS_OPENBSD_FALSE@go_net_tcpsockopt_file = go/net/tcpsockopt_darwin.go @LIBGO_IS_OPENBSD_TRUE@go_net_tcpsockopt_file = go/net/tcpsockopt_openbsd.go go_net_files = \ diff --git a/libgo/go/net/tcpsockopt_solaris.go b/libgo/go/net/tcpsockopt_solaris.go deleted file mode 100644 index a285e2d8d61..00000000000 --- a/libgo/go/net/tcpsockopt_solaris.go +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package net - -import ( - "os" - "syscall" - "time" -) - -// Set keep alive period. -func setKeepAlivePeriod(fd *netFD, d time.Duration) error { - if err := fd.incref(); err != nil { - return err - } - defer fd.decref() - - // The kernel expects milliseconds so round to next highest millisecond. - d += (time.Millisecond - time.Nanosecond) - msecs := int(d.Nanoseconds() / time.Millisecond) - - return os.NewSyscallError("setsockopt", syscall.SetsockoptInt(fd.sysfd, syscall.IPPROTO_TCP, syscall.TCP_KEEPALIVE_THRESHOLD, msecs)) -} |
