From 2a89e5c2ccef6fd32146367d02fc885bc0ad8293 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sat, 15 Nov 2014 15:56:37 -0800 Subject: [PATCH] basis: some more os require cleanup. --- basis/environment/unix/unix.factor | 5 +---- basis/unix/utmpx/utmpx.factor | 10 +++------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/basis/environment/unix/unix.factor b/basis/environment/unix/unix.factor index 855a4d1404..be4a544c57 100644 --- a/basis/environment/unix/unix.factor +++ b/basis/environment/unix/unix.factor @@ -31,7 +31,4 @@ M: unix set-os-envs-pointer ( malloc -- ) environ set-void* ; M: unix (set-os-envs) ( seq -- ) utf8 strings>alien malloc-byte-array set-os-envs-pointer ; -os { - { macosx [ "environment.unix.macosx" require ] } - [ drop ] -} case +os macosx? [ "environment.unix.macosx" require ] when diff --git a/basis/unix/utmpx/utmpx.factor b/basis/unix/utmpx/utmpx.factor index bbfa5771b2..3413cc8b9c 100644 --- a/basis/unix/utmpx/utmpx.factor +++ b/basis/unix/utmpx/utmpx.factor @@ -1,9 +1,8 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.c-types alien.data alien.syntax combinators +USING: accessors alien.c-types alien.data alien.syntax continuations io.encodings.string io.encodings.utf8 kernel -sequences strings calendar system accessors unix unix.time -unix.ffi calendar.unix vocabs classes.struct ; +sequences system unix.ffi vocabs ; IN: unix.utmpx CONSTANT: EMPTY 0 @@ -48,7 +47,4 @@ M: unix new-utmpx-record produce nip ] with-utmpx ; -os { - { macosx [ "unix.utmpx.macosx" require ] } - { linux [ "unix.utmpx.linux" require ] } -} case +"unix.utmpx." os name>> append require