diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | io.c | 4 |
2 files changed, 6 insertions, 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> * ext/date/date_strftime.c: should also be aware of flags on @@ -1502,8 +1502,6 @@ rb_io_set_pos(VALUE io, VALUE offset) static void clear_readconv(rb_io_t *fptr); -#ifdef HAVE_FSYNC - /* * call-seq: * ios.rewind -> 0 @@ -1685,6 +1683,8 @@ rb_io_set_sync(VALUE io, VALUE sync) return sync; } +#ifdef HAVE_FSYNC + /* * call-seq: * ios.fsync -> 0 or nil |