From 149dca256068264603f67101b4a4462f4181bb63 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 20 Jul 2005 10:21:16 +0000 Subject: * io.c (S_ISREG): need to define S_ISREG before it is used first. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 8 ++++---- test/sdbm/test_sdbm.rb | 14 +++++++------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85904d774b..63378aebf9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jul 20 19:20:37 2005 NAKAMURA Usaku + + * io.c (S_ISREG): need to define S_ISREG before it is used first. + Wed Jul 20 18:40:50 2005 Hirokazu Yamamoto * io.c (wsplit_p): patch for the environment where diff --git a/io.c b/io.c index 784f7c60a1..43bd9c5d4b 100644 --- a/io.c +++ b/io.c @@ -388,6 +388,10 @@ rb_io_wait_writable(f) } } +#ifndef S_ISREG +# define S_ISREG(m) ((m & S_IFMT) == S_IFREG) +#endif + static int wsplit_p(OpenFile *fptr) { @@ -1061,10 +1065,6 @@ rb_io_fread(ptr, len, f) return io_fread(ptr, len, &of); } -#ifndef S_ISREG -# define S_ISREG(m) ((m & S_IFMT) == S_IFREG) -#endif - #define SMALLBUF 100 static long diff --git a/test/sdbm/test_sdbm.rb b/test/sdbm/test_sdbm.rb index abaadbaf71..17b3d3c4e7 100644 --- a/test/sdbm/test_sdbm.rb +++ b/test/sdbm/test_sdbm.rb @@ -31,14 +31,14 @@ class TestSDBM < Test::Unit::TestCase end end - def have_fork? - begin - fork{} - true - rescue NotImplementedError - false - end + def have_fork? + begin + fork{} + true + rescue NotImplementedError + false end + end def test_version assert(! SDBM.const_defined?(:VERSION)) -- cgit v1.2.3