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 596cf33004e2491b24f5c522b2a30b44493f869c..bf0a387775de494f0852f3ba9af2f6c85870101e 100644 (file)
--- a/src/pkg/net/fd.go
+++ b/src/pkg/net/fd.go
@@ -18,9 +18,9 @@ import (
 // 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) decref() {
 }
 
 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 ee8f162120dd148becffecd73ab01bd8852dc650..efd846e5d8c8aefb16ab1316ba8df280e7886eb0 100644 (file)
--- 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 (o *acceptOp) Name() string {
 
 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 6f9b4a04c6cfb1ea9a217b41e027b580ed28be58..f5a6d8804da6361f95418be4d7ae2203717ac439 100644 (file)
--- a/src/pkg/net/sendfile_windows.go
+++ b/src/pkg/net/sendfile_windows.go
@@ -50,7 +50,7 @@ func sendFile(c *netFD, r io.Reader) (written int64, err error, handled bool) {
 
        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()