From 5e129a896448563f4d49f1c686dd7e81210518c1 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 4 Apr 2014 08:03:46 -0700 Subject: [PATCH] more libc fixes. --- basis/io/launcher/unix/unix-tests.factor | 4 ++-- basis/io/mmap/mmap.factor | 6 ++---- basis/io/mmap/unix/unix.factor | 5 +++-- basis/system-info/linux/linux.factor | 2 +- basis/system-info/macosx/macosx.factor | 2 +- basis/unix/signals/signals-tests.factor | 4 ++-- basis/x11/io/unix/unix.factor | 2 +- extra/io/serial/linux/linux.factor | 2 +- extra/time/unix/unix.factor | 4 ++-- 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/basis/io/launcher/unix/unix-tests.factor b/basis/io/launcher/unix/unix-tests.factor index 0a98c80c58..9b685184a0 100644 --- a/basis/io/launcher/unix/unix-tests.factor +++ b/basis/io/launcher/unix/unix-tests.factor @@ -3,8 +3,8 @@ concurrency.promises continuations debugger.unix destructors io io.backend.unix io.directories io.encodings.ascii io.encodings.binary io.encodings.utf8 io.files io.files.temp io.launcher io.launcher.unix io.pathnames io.streams.duplex -io.timeouts kernel locals math namespaces sequences threads -tools.test unix unix.process ; +io.timeouts kernel libc locals math namespaces sequences +threads tools.test unix unix.process ; IN: io.launcher.unix.tests : arch-temp-file ( str -- str' ) diff --git a/basis/io/mmap/mmap.factor b/basis/io/mmap/mmap.factor index ec51de4261..67c245d956 100644 --- a/basis/io/mmap/mmap.factor +++ b/basis/io/mmap/mmap.factor @@ -1,9 +1,7 @@ ! Copyright (C) 2007, 2009 Doug Coleman, Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: continuations destructors io.files io.files.info -io.backend kernel quotations system alien alien.accessors -accessors vocabs combinators alien.c-types alien.data -math ; +USING: accessors alien.c-types alien.data combinators +destructors io.backend io.files.info kernel math system vocabs ; IN: io.mmap TUPLE: mapped-file < disposable address handle length ; diff --git a/basis/io/mmap/unix/unix.factor b/basis/io/mmap/unix/unix.factor index 84378efeb8..9703561b91 100644 --- a/basis/io/mmap/unix/unix.factor +++ b/basis/io/mmap/unix/unix.factor @@ -1,7 +1,8 @@ ! Copyright (C) 2007 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors destructors io.backend.unix io.mmap literals -io.mmap.private kernel locals math.bitwise system unix unix.ffi ; +USING: accessors destructors io.backend.unix io.mmap +io.mmap.private kernel libc literals locals system unix +unix.ffi ; IN: io.mmap.unix :: mmap-open ( path length prot flags open-mode -- alien fd ) diff --git a/basis/system-info/linux/linux.factor b/basis/system-info/linux/linux.factor index c2d17fe118..bcc207ab53 100644 --- a/basis/system-info/linux/linux.factor +++ b/basis/system-info/linux/linux.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors alien.c-types alien.syntax byte-arrays io io.encodings.string io.encodings.utf8 io.streams.byte-array -kernel sequences splitting strings system system-info unix +libc kernel sequences splitting strings system system-info unix unix.linux.proc math ; IN: system-info.linux diff --git a/basis/system-info/macosx/macosx.factor b/basis/system-info/macosx/macosx.factor index 00f5f01051..d5b6e7976b 100644 --- a/basis/system-info/macosx/macosx.factor +++ b/basis/system-info/macosx/macosx.factor @@ -3,7 +3,7 @@ USING: alien alien.c-types alien.data alien.strings alien.syntax arrays assocs byte-arrays combinators core-foundation io.binary -io.encodings.utf8 kernel math namespaces sequences system +io.encodings.utf8 libc kernel math namespaces sequences system system-info unix ; IN: system-info.macosx diff --git a/basis/unix/signals/signals-tests.factor b/basis/unix/signals/signals-tests.factor index bb6164ed09..8ca3aa93f9 100644 --- a/basis/unix/signals/signals-tests.factor +++ b/basis/unix/signals/signals-tests.factor @@ -1,5 +1,5 @@ -USING: calendar continuations io kernel math namespaces threads -tools.test unix.ffi unix.process unix.signals ; +USING: calendar continuations io kernel libc math namespaces +threads tools.test unix.ffi unix.process unix.signals ; IN: unix.signals.tests SYMBOL: sigusr1-count diff --git a/basis/x11/io/unix/unix.factor b/basis/x11/io/unix/unix.factor index effcd2c25b..639ba1736e 100644 --- a/basis/x11/io/unix/unix.factor +++ b/basis/x11/io/unix/unix.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: io.backend.unix io.backend.unix.multiplexers -namespaces system x11 x11.xlib x11.io +io.files namespaces system x11 x11.xlib x11.io accessors threads sequences kernel ; IN: x11.io.unix diff --git a/extra/io/serial/linux/linux.factor b/extra/io/serial/linux/linux.factor index 4763ceb641..6da3e721c4 100644 --- a/extra/io/serial/linux/linux.factor +++ b/extra/io/serial/linux/linux.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: accessors classes.struct combinators io.backend.unix -io.ports io.serial io.streams.duplex kernel literals math +io.ports io.serial io.streams.duplex kernel libc literals math system unix unix.ffi io.serial.linux.ffi ; IN: io.serial.linux diff --git a/extra/time/unix/unix.factor b/extra/time/unix/unix.factor index d4bd45aeae..6201033663 100644 --- a/extra/time/unix/unix.factor +++ b/extra/time/unix/unix.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2010 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors calendar classes.struct kernel math system time -unix unix.time ; +USING: accessors calendar classes.struct kernel libc math +system time unix unix.time ; IN: time.unix : timestamp>timezone ( timestamp -- timezone )