diff options
author | Ori Bernstein <ori@eigenstate.org> | 2014-10-06 18:34:12 -0400 |
---|---|---|
committer | Ori Bernstein <ori@eigenstate.org> | 2014-10-06 18:34:12 -0400 |
commit | fc03d6189b22d17ac7554ac3de5ab5d47f7d0030 (patch) | |
tree | 8d91dce0e9a7bc3ec157d2e0a911c44f6ac3e406 | |
parent | e3ada3da7e9e7681e86b3f837071e21b499f857a (diff) | |
download | mc-fc03d6189b22d17ac7554ac3de5ab5d47f7d0030.tar.gz |
Fix osx libsys build.
-rw-r--r-- | libstd/dir+osx.myr | 13 | ||||
-rw-r--r-- | libstd/syswrap.myr | 1 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libstd/dir+osx.myr b/libstd/dir+osx.myr index 1463349..28ef26b 100644 --- a/libstd/dir+osx.myr +++ b/libstd/dir+osx.myr @@ -1,15 +1,16 @@ +use sys + use "alloc.use" use "die.use" use "option.use" use "result.use" use "slcp.use" use "sldup.use" -use "sys.use" use "types.use" pkg std = type dir = struct - fd : fd + fd : sys.fd buf : byte[16384] len : int64 off : int64 @@ -25,7 +26,7 @@ const diropen = {p var fd var dir - fd = open(p, Ordonly | Odir) + fd = sys.open(p, sys.Ordonly | sys.Odir) if fd < 0 -> `Fail "couldn't open directory" ;; @@ -39,7 +40,7 @@ const dirread = {d var dent if d.off >= d.len - len = getdirentries64(d.fd, d.buf[:], &d.base) + len = sys.getdirentries64(d.fd, d.buf[:], &d.base) if len <= 0 -> `None ;; @@ -47,13 +48,13 @@ const dirread = {d d.off = 0 ;; - dent = &d.buf[d.off] castto(dirent64#) + dent = &d.buf[d.off] castto(sys.dirent64#) d.off += dent.reclen castto(int64) -> `Some sldup(dent.name[:dent.namlen]) } const dirclose = {d - close(d.fd) + sys.close(d.fd) free(d) } diff --git a/libstd/syswrap.myr b/libstd/syswrap.myr index 4de4827..d2dca20 100644 --- a/libstd/syswrap.myr +++ b/libstd/syswrap.myr @@ -10,7 +10,6 @@ pkg std = const Owronly : fdopt = sys.Owronly castto(fdopt) const Ordwr : fdopt = sys.Ordwr castto(fdopt) const Ocreat : fdopt = sys.Ocreat castto(fdopt) - const Oexcl : fdopt = sys.Oexcl castto(fdopt) const Otrunc : fdopt = sys.Otrunc castto(fdopt) const Oappend : fdopt = sys.Oappend castto(fdopt) const Odir : fdopt = sys.Odir castto(fdopt) |