net: fix windows build
R=rsc, bradfitz
CC=golang-dev
https://golang.org/cl/5661055
diff --git a/src/pkg/net/fd.go b/src/pkg/net/fd.go
index 596cf33..bf0a387 100644
--- a/src/pkg/net/fd.go
+++ b/src/pkg/net/fd.go
@@ -18,9 +18,9 @@
// Network file descriptor.
type netFD struct {
// locking/lifetime of sysfd
- sysmu sync.Mutex
- sysref int
-
+ sysmu sync.Mutex
+ sysref int
+
// must lock both sysmu and pollserver to write
// can lock either to read
closing bool
@@ -376,7 +376,7 @@
}
func (fd *netFD) Close() error {
- pollserver.Lock() // needed for both fd.incref(true) and pollserver.Evict
+ pollserver.Lock() // needed for both fd.incref(true) and pollserver.Evict
defer pollserver.Unlock()
if err := fd.incref(true); err != nil {
return err
diff --git a/src/pkg/net/fd_windows.go b/src/pkg/net/fd_windows.go
index ee8f162..efd846e 100644
--- a/src/pkg/net/fd_windows.go
+++ b/src/pkg/net/fd_windows.go
@@ -5,6 +5,7 @@
package net
import (
+ "errors"
"io"
"os"
"runtime"
@@ -518,7 +519,7 @@
func (fd *netFD) accept(toAddr func(syscall.Sockaddr) Addr) (*netFD, error) {
if err := fd.incref(false); err != nil {
- return 0, err
+ return nil, err
}
defer fd.decref()
diff --git a/src/pkg/net/sendfile_windows.go b/src/pkg/net/sendfile_windows.go
index 6f9b4a0..f5a6d88 100644
--- a/src/pkg/net/sendfile_windows.go
+++ b/src/pkg/net/sendfile_windows.go
@@ -50,7 +50,7 @@
c.wio.Lock()
defer c.wio.Unlock()
- if err := c.incref(); err != nil {
+ if err := c.incref(false); err != nil {
return 0, err, true
}
defer c.decref()
