yugui	2009-12-05 18:40:53 +0900 (Sat, 05 Dec 2009)

  New Revision: 26018

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

  Log:
    merges r24253 from trunk into ruby_1_9_1.
    --
    * win32/win32.c (rb_w32_{open,wopen}): fixed typos. these conditions
      mean to call runtime's open() if textmode.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/version.h
    branches/ruby_1_9_1/win32/win32.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 26017)
+++ ruby_1_9_1/ChangeLog	(revision 26018)
@@ -1,3 +1,8 @@
+Thu Jul 23 14:35:02 2009  NAKAMURA Usaku  <usa@r...>
+
+	* win32/win32.c (rb_w32_{open,wopen}): fixed typos. these conditions
+	  mean to call runtime's open() if textmode.
+
 Fri Sep 25 16:01:45 2009  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c, include/ruby/win32.h (rb_w32_access): new function to
Index: ruby_1_9_1/win32/win32.c
===================================================================
--- ruby_1_9_1/win32/win32.c	(revision 26017)
+++ ruby_1_9_1/win32/win32.c	(revision 26018)
@@ -4074,7 +4074,7 @@
     SECURITY_ATTRIBUTES sec;
     HANDLE h;
 
-    if ((oflag & O_TEXT) || !(oflag & ~O_BINARY)) {
+    if ((oflag & O_TEXT) || !(oflag & O_BINARY)) {
 	va_list arg;
 	int pmode;
 	va_start(arg, oflag);
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 26017)
+++ ruby_1_9_1/version.h	(revision 26018)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 371
+#define RUBY_PATCHLEVEL 372
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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