ruby-changes:23610
From: usa <ko1@a...>
Date: Wed, 16 May 2012 14:31:37 +0900 (JST)
Subject: [ruby-changes:23610] usa:r35661 (trunk): * io.c: fixed a merge mistake of r33878, reported by nobu via IRC.
usa 2012-05-16 14:31:27 +0900 (Wed, 16 May 2012) New Revision: 35661 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35661 Log: * io.c: fixed a merge mistake of r33878, reported by nobu via IRC. Modified files: trunk/ChangeLog trunk/io.c Index: ChangeLog =================================================================== --- ChangeLog (revision 35660) +++ ChangeLog (revision 35661) @@ -1,3 +1,7 @@ +Wed May 16 14:30:43 2012 NAKAMURA Usaku <usa@r...> + + * io.c: fixed a merge mistake of r33878, reported by nobu via IRC. + Wed May 16 06:59:41 2012 Tadayoshi Funaba <tadf@d...> * ext/date/date_strftime.c: should also be aware of flags on Index: io.c =================================================================== --- io.c (revision 35660) +++ io.c (revision 35661) @@ -1502,8 +1502,6 @@ static void clear_readconv(rb_io_t *fptr); -#ifdef HAVE_FSYNC - /* * call-seq: * ios.rewind -> 0 @@ -1685,6 +1683,8 @@ return sync; } +#ifdef HAVE_FSYNC + /* * call-seq: * ios.fsync -> 0 or nil -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/