From 32dbd07c7781eb824d29a24d7117bf43076df10f Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 1 Dec 2008 17:51:21 -0600 Subject: [PATCH 1/2] remove empty vocab --- extra/line-art/authors.txt | 1 - extra/line-art/summary.txt | 1 - extra/line-art/tags.txt | 3 --- 3 files changed, 5 deletions(-) delete mode 100644 extra/line-art/authors.txt delete mode 100644 extra/line-art/summary.txt delete mode 100644 extra/line-art/tags.txt diff --git a/extra/line-art/authors.txt b/extra/line-art/authors.txt deleted file mode 100644 index 6a0dc7293a..0000000000 --- a/extra/line-art/authors.txt +++ /dev/null @@ -1 +0,0 @@ -Joe Groff \ No newline at end of file diff --git a/extra/line-art/summary.txt b/extra/line-art/summary.txt deleted file mode 100644 index 06d16da2bf..0000000000 --- a/extra/line-art/summary.txt +++ /dev/null @@ -1 +0,0 @@ -Stanford Bunny rendered with cartoon-style lines instead of shading \ No newline at end of file diff --git a/extra/line-art/tags.txt b/extra/line-art/tags.txt deleted file mode 100644 index 0db7e8e629..0000000000 --- a/extra/line-art/tags.txt +++ /dev/null @@ -1,3 +0,0 @@ -demos -opengl -glsl \ No newline at end of file From 439f91bb84dc18b8d64892d210bc93f2c8c53a74 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 1 Dec 2008 20:30:52 -0600 Subject: [PATCH 2/2] fix usings --- basis/io/unix/files/freebsd/freebsd.factor | 6 +++--- basis/io/unix/files/openbsd/openbsd.factor | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/basis/io/unix/files/freebsd/freebsd.factor b/basis/io/unix/files/freebsd/freebsd.factor index 48dfd37584..16ef9f61d2 100644 --- a/basis/io/unix/files/freebsd/freebsd.factor +++ b/basis/io/unix/files/freebsd/freebsd.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.syntax kernel unix math accessors -combinators system io.backend alien.c-types unix.statfs -io.files ; +USING: accessors alien.c-types alien.syntax combinators +io.backend io.files io.unix.files kernel math system unix +unix.statfs unix.statvfs.freebsd ; IN: io.unix.files.freebsd M: freebsd file-system-statvfs ( path -- byte-array ) diff --git a/basis/io/unix/files/openbsd/openbsd.factor b/basis/io/unix/files/openbsd/openbsd.factor index d348d281fb..bea10de7bb 100644 --- a/basis/io/unix/files/openbsd/openbsd.factor +++ b/basis/io/unix/files/openbsd/openbsd.factor @@ -2,16 +2,19 @@ ! See http://factorcode.org/license.txt for BSD license. USING: alien.syntax accessors combinators kernel unix.types math system io.backend alien.c-types unix -unix.statfs io.files ; +unix.statfs io.files io.unix.files unix.statvfs.openbsd ; IN: io.unix.files.openbsd -M: openbsd >file-system-info ( file-system-info statvfs -- file-system-info' ) +M: openbsd file-system-statvfs ( normalized-path -- statvfs ) + "statvfs" tuck statvfs io-error ; + +M: openbsd statvfs>file-system-info ( file-system-info statvfs -- file-system-info' ) { [ statvfs-f_bsize >>block-size ] [ statvfs-f_frsize >>preferred-block-size ] [ statvfs-f_blocks >>blocks ] [ statvfs-f_bfree >>blocks-free ] - [ statvfs-f_bavail >>blocks-avail ] + [ statvfs-f_bavail >>blocks-available ] [ statvfs-f_files >>files ] [ statvfs-f_ffree >>files-free ] [ statvfs-f_favail >>files-available ] @@ -19,6 +22,3 @@ M: openbsd >file-system-info ( file-system-info statvfs -- file-system-info' ) [ statvfs-f_flag >>flags ] [ statvfs-f_namemax >>name-max ] } cleave ; - -M: openbsd file-system-statvfs ( normalized-path -- statvfs ) - "statvfs" tuck statvfs io-error ;