diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-17 03:20:02 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-17 03:20:02 +0000 |
commit | 1d7dc02647c13c8f3884fcaa80b7f11415205384 (patch) | |
tree | 8cf5d66c6b063634373f0dda9a48cb1fe093ca39 | |
parent | 76bc2d1ed7f13fb329c33f48756ea3c24c59a6ea (diff) | |
download | ruby-1d7dc02647c13c8f3884fcaa80b7f11415205384.tar.gz |
* io.c: Fix a mistake on merging the patch in the previous commit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | io.c | 5 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Thu May 17 12:18:47 2012 Yuki Yugui Sonoda <yugui@google.com> + + * io.c: Fix a mistake on merging the patch in the previous commit. + Thu May 17 11:33:07 2012 Yuki Yugui Sonoda <yugui@google.com> Imports Ruby's port to NativeClient (a.k.a NaCl). @@ -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 |