1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* io.c: Fix a mistake on merging the patch in the previous commit.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2012-05-17 03:20:02 +00:00
parent 76bc2d1ed7
commit 1d7dc02647
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> Thu May 17 11:33:07 2012 Yuki Yugui Sonoda <yugui@google.com>
Imports Ruby's port to NativeClient (a.k.a NaCl). Imports Ruby's port to NativeClient (a.k.a NaCl).

5
io.c
View File

@ -1506,7 +1506,7 @@ rb_io_set_pos(VALUE io, VALUE offset)
static void clear_readconv(rb_io_t *fptr); static void clear_readconv(rb_io_t *fptr);
#if defined(HAVE_FSYNC) || !defined(_WIN32) #if defined(HAVE_FSYNC)
/* /*
* call-seq: * call-seq:
* ios.rewind -> 0 * ios.rewind -> 0
@ -1635,7 +1635,6 @@ rb_io_eof(VALUE io)
return Qfalse; return Qfalse;
} }
#ifdef HAVE_FSYNC
/* /*
* call-seq: * call-seq:
* ios.sync -> true or false * ios.sync -> true or false
@ -1659,6 +1658,8 @@ rb_io_sync(VALUE io)
return (fptr->mode & FMODE_SYNC) ? Qtrue : Qfalse; return (fptr->mode & FMODE_SYNC) ? Qtrue : Qfalse;
} }
#ifdef HAVE_FSYNC
/* /*
* call-seq: * call-seq:
* ios.sync = boolean -> boolean * ios.sync = boolean -> boolean