mirror of
https://github.com/golang/go.git
synced 2025-05-16 04:44:39 +00:00
fix linux build
R=rsc OCL=27579 CL=27579
This commit is contained in:
parent
1f6463f823
commit
3a8ff8237a
@ -114,9 +114,9 @@ func (p *pollster) WaitFD(nsec int64) (fd int64, mode int, err *os.Error) {
|
|||||||
if nsec > 0 {
|
if nsec > 0 {
|
||||||
msec = (nsec + 1e6 - 1)/1e6;
|
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 {
|
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 {
|
if e != 0 {
|
||||||
return -1, 0, os.ErrnoToError(e);
|
return -1, 0, os.ErrnoToError(e);
|
||||||
|
@ -59,7 +59,7 @@ func readdirnames(file *File, count int) (names []string, err *os.Error) {
|
|||||||
if dirent.Ino == 0 { // File absent in directory.
|
if dirent.Ino == 0 { // File absent in directory.
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
var name = string(dirent.Name[0:clen(dirent.Name)]);
|
var name = string(dirent.Name[0:clen(&dirent.Name)]);
|
||||||
if name == "." || name == ".." { // Useless names
|
if name == "." || name == ".." { // Useless names
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user