From 36d6bcbb76ffececbb636af1c7cf8b605438b1a3 Mon Sep 17 00:00:00 2001 From: Dirkjan Bussink Date: Mon, 23 Nov 2009 21:12:14 +0100 Subject: [PATCH] Remove conditional check for major / minor since that doesn't work for C++ --- spec/tags/frozen/core/file/stat/dev_major_tags.txt | 1 - spec/tags/frozen/core/file/stat/dev_minor_tags.txt | 1 - spec/tags/frozen/core/file/stat/rdev_major_tags.txt | 1 - spec/tags/frozen/core/file/stat/rdev_minor_tags.txt | 1 - vm/ffi_util.cpp | 8 -------- 5 files changed, 12 deletions(-) delete mode 100644 spec/tags/frozen/core/file/stat/dev_major_tags.txt delete mode 100644 spec/tags/frozen/core/file/stat/dev_minor_tags.txt delete mode 100644 spec/tags/frozen/core/file/stat/rdev_major_tags.txt delete mode 100644 spec/tags/frozen/core/file/stat/rdev_minor_tags.txt diff --git a/spec/tags/frozen/core/file/stat/dev_major_tags.txt b/spec/tags/frozen/core/file/stat/dev_major_tags.txt deleted file mode 100644 index b94643dc54..0000000000 --- a/spec/tags/frozen/core/file/stat/dev_major_tags.txt +++ /dev/null @@ -1 +0,0 @@ -fails:File::Stat#dev_major returns the major part of File::Stat#dev diff --git a/spec/tags/frozen/core/file/stat/dev_minor_tags.txt b/spec/tags/frozen/core/file/stat/dev_minor_tags.txt deleted file mode 100644 index 87e2e97b63..0000000000 --- a/spec/tags/frozen/core/file/stat/dev_minor_tags.txt +++ /dev/null @@ -1 +0,0 @@ -fails:File::Stat#dev_minor returns the minor part of File::Stat#dev diff --git a/spec/tags/frozen/core/file/stat/rdev_major_tags.txt b/spec/tags/frozen/core/file/stat/rdev_major_tags.txt deleted file mode 100644 index 63eecf531e..0000000000 --- a/spec/tags/frozen/core/file/stat/rdev_major_tags.txt +++ /dev/null @@ -1 +0,0 @@ -fails:File::Stat#rdev_major returns the major part of File::Stat#rdev diff --git a/spec/tags/frozen/core/file/stat/rdev_minor_tags.txt b/spec/tags/frozen/core/file/stat/rdev_minor_tags.txt deleted file mode 100644 index 1ecbcb9ac7..0000000000 --- a/spec/tags/frozen/core/file/stat/rdev_minor_tags.txt +++ /dev/null @@ -1 +0,0 @@ -fails:File::Stat#rdev_minor returns the minor part of File::Stat#rdev diff --git a/vm/ffi_util.cpp b/vm/ffi_util.cpp index eb76ce70c8..d5811fbdcd 100644 --- a/vm/ffi_util.cpp +++ b/vm/ffi_util.cpp @@ -147,19 +147,11 @@ unsigned int ffi_cast(unsigned int val) { } long ffi_major(dev_t n) { -#if defined(major) return major(n); -#else - return -1; -#endif } long ffi_minor(dev_t n) { -#if defined(minor) return minor(n); -#else - return -1; -#endif } /* FIXME: these are TEMPORARY until we determine how to