From: Rob Pike <r@golang.org>
Date: Fri, 17 Apr 2009 05:43:34 +0000 (-0700)
Subject: fix linux build
X-Git-Tag: weekly.2009-11-06~1811
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3a8ff8237a65defbb4846cb15576bef4dee66b5f;p=gostls13.git

fix linux build

R=rsc
OCL=27579
CL=27579
---

diff --git a/src/lib/net/fd_linux.go b/src/lib/net/fd_linux.go
index 8e2b57f224..ecdf1da841 100644
--- a/src/lib/net/fd_linux.go
+++ b/src/lib/net/fd_linux.go
@@ -114,9 +114,9 @@ func (p *pollster) WaitFD(nsec int64) (fd int64, mode int, err *os.Error) {
 	if nsec > 0 {
 		msec = (nsec + 1e6 - 1)/1e6;
 	}
-	n, e := syscall.Epoll_wait(p.epfd, evarray, msec);
+	n, e := syscall.Epoll_wait(p.epfd, &evarray, msec);
 	for e == syscall.EAGAIN || e == syscall.EINTR {
-		n, e = syscall.Epoll_wait(p.epfd, evarray, msec);
+		n, e = syscall.Epoll_wait(p.epfd, &evarray, msec);
 	}
 	if e != 0 {
 		return -1, 0, os.ErrnoToError(e);
diff --git a/src/lib/os/dir_amd64_linux.go b/src/lib/os/dir_amd64_linux.go
index 7f8be6f509..582e4f632d 100644
--- a/src/lib/os/dir_amd64_linux.go
+++ b/src/lib/os/dir_amd64_linux.go
@@ -59,7 +59,7 @@ func readdirnames(file *File, count int) (names []string, err *os.Error) {
 			if dirent.Ino == 0 {	// File absent in directory.
 				continue
 			}
-			var name = string(dirent.Name[0:clen(dirent.Name)]);
+			var name = string(dirent.Name[0:clen(&dirent.Name)]);
 			if name == "." || name == ".." {	// Useless names
 				continue
 			}