From df4aa89a5e7acb315655f193e7f549e8d32367e2 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Fri, 13 Jan 2012 05:11:45 +0000
Subject: libgo: Update to weekly.2011-12-22.

From-SVN: r183150
---
 libgo/go/net/fd.go | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'libgo/go/net/fd.go')

diff --git a/libgo/go/net/fd.go b/libgo/go/net/fd.go
index 5318c51..3dec9f4 100644
--- a/libgo/go/net/fd.go
+++ b/libgo/go/net/fd.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin freebsd linux openbsd
+// +build darwin freebsd linux netbsd openbsd
 
 package net
 
@@ -377,14 +377,6 @@ func (fd *netFD) CloseWrite() error {
 	return fd.shutdown(syscall.SHUT_WR)
 }
 
-type timeoutError struct{}
-
-func (e *timeoutError) Error() string   { return "i/o timeout" }
-func (e *timeoutError) Timeout() bool   { return true }
-func (e *timeoutError) Temporary() bool { return true }
-
-var errTimeout error = &timeoutError{}
-
 func (fd *netFD) Read(p []byte) (n int, err error) {
 	if fd == nil {
 		return 0, os.EINVAL
-- 
cgit v1.1