nobu	2012-05-21 22:24:01 +0900 (Mon, 21 May 2012)

  New Revision: 35751

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35751

  Log:
    merge revision(s) 33944:
    
    * io.c: suppress unused-value warnings.  fixup of r33937.

  Modified files:
    branches/ruby_1_9_3/io.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/io.c
===================================================================
--- ruby_1_9_3/io.c	(revision 35750)
+++ ruby_1_9_3/io.c	(revision 35751)
@@ -366,10 +366,10 @@
 # define DEFAULT_TEXTMODE 0
 #define NEED_READCONV(fptr) ((fptr)->encs.enc2 != NULL || NEED_NEWLINE_DECORATOR_ON_READ(fptr))
 #define NEED_WRITECONV(fptr) (((fptr)->encs.enc != NULL && (fptr)->encs.enc != rb_ascii8bit_encoding()) || NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) || ((fptr)->encs.ecflags & (ECONV_DECORATOR_MASK|ECONV_STATEFUL_DECORATOR_MASK)))
-#define SET_BINARY_MODE(fptr) 0
-#define NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr) 0
-#define SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(enc2, ecflags) 0
-#define SET_BINARY_MODE_WITH_SEEK_CUR(fptr) 0
+#define SET_BINARY_MODE(fptr) (void)(fptr)
+#define NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr) (void)(fptr)
+#define SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(enc2, ecflags) ((void)(enc2), (void)(ecflags))
+#define SET_BINARY_MODE_WITH_SEEK_CUR(fptr) (void)(fptr)
 #endif
 
 #if !defined HAVE_SHUTDOWN && !defined shutdown
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35750)
+++ ruby_1_9_3/version.h	(revision 35751)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 225
+#define RUBY_PATCHLEVEL 226
 
 #define RUBY_RELEASE_DATE "2012-05-21"
 #define RUBY_RELEASE_YEAR 2012

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/