naruse	2016-03-30 00:54:52 +0900 (Wed, 30 Mar 2016)

  New Revision: 54412

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54412

  Log:
    merge revision(s) 54094: [Backport #12171]
    
    * include/ruby/win32.h (O_SHARE_DELETE): change to fit Fixnum
      limit.  [ruby-core:74285] [Bug #12171]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/include/ruby/win32.h
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54411)
+++ ruby_2_3/ChangeLog	(revision 54412)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Wed Mar 30 00:54:38 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/win32.h (O_SHARE_DELETE): change to fit Fixnum
+	  limit.  [ruby-core:74285] [Bug #12171]
+
 Wed Mar 30 00:52:47 2016  Rei Odaira  <Rei.Odaira@g...>
 
 	* test/net/imap/test_imap.rb (test_idle_timeout): Because of the
Index: ruby_2_3/include/ruby/win32.h
===================================================================
--- ruby_2_3/include/ruby/win32.h	(revision 54411)
+++ ruby_2_3/include/ruby/win32.h	(revision 54412)
@@ -127,7 +127,7 @@ typedef unsigned int uintptr_t; https://github.com/ruby/ruby/blob/trunk/ruby_2_3/include/ruby/win32.h#L127
 
 #define WNOHANG -1
 
-#define O_SHARE_DELETE 0x80000000 /* for rb_w32_open(), rb_w32_wopen() */
+#define O_SHARE_DELETE 0x20000000 /* for rb_w32_open(), rb_w32_wopen() */
 
 typedef int clockid_t;
 #define CLOCK_REALTIME  0
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54411)
+++ ruby_2_3/version.h	(revision 54412)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
 #define RUBY_RELEASE_DATE "2016-03-30"
-#define RUBY_PATCHLEVEL 60
+#define RUBY_PATCHLEVEL 61
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54094


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