From 3c450181dc21de5fac5e6d96600bbdd16cb7fdcb Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 11 Nov 2013 21:21:50 +0000 Subject: mksysinfo, net: Always define F_DUPFD_CLOEXEC. For Solaris and CentOS portability. From-SVN: r204687 --- libgo/go/net/fd_unix.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libgo/go') diff --git a/libgo/go/net/fd_unix.go b/libgo/go/net/fd_unix.go index 9ed4f75..4911ab0 100644 --- a/libgo/go/net/fd_unix.go +++ b/libgo/go/net/fd_unix.go @@ -410,7 +410,7 @@ func (fd *netFD) accept(toAddr func(syscall.Sockaddr) Addr) (netfd *netFD, err e var tryDupCloexec = int32(1) func dupCloseOnExec(fd int) (newfd int, err error) { - if atomic.LoadInt32(&tryDupCloexec) == 1 { + if atomic.LoadInt32(&tryDupCloexec) == 1 && syscall.F_DUPFD_CLOEXEC != 0 { r0, _, e1 := syscall.Syscall(syscall.SYS_FCNTL, uintptr(fd), syscall.F_DUPFD_CLOEXEC, 0) if runtime.GOOS == "darwin" && e1 == syscall.EBADF { // On OS X 10.6 and below (but we only support -- cgit v1.1