summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/win32.h2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 85ef74170b..b6bd2664c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 30 00:54:38 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@gmail.com>
* test/net/imap/test_imap.rb (test_idle_timeout): Because of the
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
index c26aa9d4f9..47f68b8cb2 100644
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@ -127,7 +127,7 @@ typedef unsigned int uintptr_t;
#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
diff --git a/version.h b/version.h
index 74d8d4d856..dc26fda268 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#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