2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bd1bf17e6..85f1b0bd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 26 01:48:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: test _WIN32 for CRLF platform.  (cygwin defines O_BINARY.)
+
 Tue Aug 26 01:29:26 2008  Tanaka Akira  <akr@fsij.org>
 
 	* io.c: force CRLF handling if RUBY_TEST_CRLF_ENVIRONMENT is defined.
diff --git a/io.c b/io.c
index 2fba88e08..d1d350e10 100644
--- a/io.c
+++ b/io.c
@@ -673,8 +673,7 @@ rb_io_wait_writable(int f)
     }
 }
 
-/* xxx: better way to determine the newline of the platform? */
-#if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(O_BINARY) && O_BINARY != 0
+#if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
 /* Windows */
 # define NEED_NEWLINE_DECODER(fptr) (!(fptr->mode & FMODE_BINMODE))
 # define NEED_NEWLINE_ENCODER(fptr) (!(fptr->mode & FMODE_BINMODE))