diff --git a/ChangeLog b/ChangeLog index 554db48721..7992709b88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu May 17 12:18:47 2012 Yuki Yugui Sonoda + + * io.c: Fix a mistake on merging the patch in the previous commit. + Thu May 17 11:33:07 2012 Yuki Yugui Sonoda Imports Ruby's port to NativeClient (a.k.a NaCl). diff --git a/io.c b/io.c index ad2394daf6..87b0233de9 100644 --- a/io.c +++ b/io.c @@ -1506,7 +1506,7 @@ rb_io_set_pos(VALUE io, VALUE offset) static void clear_readconv(rb_io_t *fptr); -#if defined(HAVE_FSYNC) || !defined(_WIN32) +#if defined(HAVE_FSYNC) /* * call-seq: * ios.rewind -> 0 @@ -1635,7 +1635,6 @@ rb_io_eof(VALUE io) return Qfalse; } -#ifdef HAVE_FSYNC /* * call-seq: * ios.sync -> true or false @@ -1659,6 +1658,8 @@ rb_io_sync(VALUE io) return (fptr->mode & FMODE_SYNC) ? Qtrue : Qfalse; } +#ifdef HAVE_FSYNC + /* * call-seq: * ios.sync = boolean -> boolean