ruby-changes:14195
From: yugui <ko1@a...>
Date: Sat, 5 Dec 2009 18:49:01 +0900 (JST)
Subject: [ruby-changes:14195] Ruby:r26016 (ruby_1_9_1): merges r25133 from trunk into ruby_1_9_1. c.f.
yugui 2009-12-05 18:40:33 +0900 (Sat, 05 Dec 2009) New Revision: 26016 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26016 Log: merges r25133 from trunk into ruby_1_9_1. c.f. [ruby-dev:39819] -- * win32/wini32.c (LK_ERR): with overlapped I/O, LockFileEx() returns ERROR_IO_PENDING if the file is locked. 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 26015) +++ ruby_1_9_1/ChangeLog (revision 26016) @@ -1,3 +1,8 @@ +Mon Sep 28 19:36:20 2009 NAKAMURA Usaku <usa@r...> + + * win32/wini32.c (LK_ERR): with overlapped I/O, LockFileEx() returns + ERROR_IO_PENDING if the file is locked. + Mon Nov 23 04:12:00 2009 Tanaka Akira <akr@f...> * enc/trans/newline.trans (fun_so_universal_newline): generate \n Index: ruby_1_9_1/win32/win32.c =================================================================== --- ruby_1_9_1/win32/win32.c (revision 26015) +++ ruby_1_9_1/win32/win32.c (revision 26016) @@ -251,7 +251,7 @@ i = 0; \ else { \ DWORD err = GetLastError(); \ - if (err == ERROR_LOCK_VIOLATION) \ + if (err == ERROR_LOCK_VIOLATION || err == ERROR_IO_PENDING) \ errno = EWOULDBLOCK; \ else if (err == ERROR_NOT_LOCKED) \ i = 0; \ Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 26015) +++ ruby_1_9_1/version.h (revision 26016) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 369 +#define RUBY_PATCHLEVEL 370 #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/