From 2fd401c8f190f1fe43e51a7f726f6ed6119a1f96 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Sat, 3 Dec 2011 02:17:34 +0000
Subject: libgo: Update to weekly.2011-11-02.

From-SVN: r181964
---
 libgo/go/net/timeout_test.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/libgo/go/net/timeout_test.go b/libgo/go/net/timeout_test.go
index 2c2c36fff..3c884ca 100644
--- a/libgo/go/net/timeout_test.go
+++ b/libgo/go/net/timeout_test.go
@@ -5,7 +5,6 @@
 package net
 
 import (
-	"os"
 	"runtime"
 	"testing"
 	"time"
@@ -22,7 +21,7 @@ func testTimeout(t *testing.T, network, addr string, readFrom bool) {
 	fd.SetReadTimeout(1e8) // 100ms
 	var b [100]byte
 	var n int
-	var err1 os.Error
+	var err1 error
 	if readFrom {
 		n, _, err1 = fd.(PacketConn).ReadFrom(b[0:])
 	} else {
-- 
cgit v1.1