mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* io.c: fixed a merge mistake of r33878, reported by nobu via IRC.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
80bd769f18
commit
0923ae5ed1
2 changed files with 6 additions and 2 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
Wed May 16 14:30:43 2012 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
|
* io.c: fixed a merge mistake of r33878, reported by nobu via IRC.
|
||||||
|
|
||||||
Wed May 16 06:59:41 2012 Tadayoshi Funaba <tadf@dotrb.org>
|
Wed May 16 06:59:41 2012 Tadayoshi Funaba <tadf@dotrb.org>
|
||||||
|
|
||||||
* ext/date/date_strftime.c: should also be aware of flags on
|
* ext/date/date_strftime.c: should also be aware of flags on
|
||||||
|
|
4
io.c
4
io.c
|
@ -1502,8 +1502,6 @@ rb_io_set_pos(VALUE io, VALUE offset)
|
||||||
|
|
||||||
static void clear_readconv(rb_io_t *fptr);
|
static void clear_readconv(rb_io_t *fptr);
|
||||||
|
|
||||||
#ifdef HAVE_FSYNC
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* call-seq:
|
* call-seq:
|
||||||
* ios.rewind -> 0
|
* ios.rewind -> 0
|
||||||
|
@ -1685,6 +1683,8 @@ rb_io_set_sync(VALUE io, VALUE sync)
|
||||||
return sync;
|
return sync;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_FSYNC
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* call-seq:
|
* call-seq:
|
||||||
* ios.fsync -> 0 or nil
|
* ios.fsync -> 0 or nil
|
||||||
|
|
Loading…
Add table
Reference in a new issue