summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-05 09:40:53 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-05 09:40:53 +0000
commit0cea933bf19f1c7e04fbde4fb07928a81925dd10 (patch)
tree2eacded47311ff8f5a88de783a334481155a0c7c
parenta968bd2efb93595c625ca124d3b6f18f525f5814 (diff)
downloadruby-0cea933bf19f1c7e04fbde4fb07928a81925dd10.tar.gz
ruby-0cea933bf19f1c7e04fbde4fb07928a81925dd10.tar.xz
ruby-0cea933bf19f1c7e04fbde4fb07928a81925dd10.zip
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. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@26018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--version.h2
-rw-r--r--win32/win32.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ba39baaa1..39d42f16a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 23 14:35:02 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* win32/win32.c, include/ruby/win32.h (rb_w32_access): new function to
diff --git a/version.h b/version.h
index de4f6527c..c4bd3ac3c 100644
--- a/version.h
+++ b/version.h
@@ -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
diff --git a/win32/win32.c b/win32/win32.c
index 345fcdd15..5d79dd17b 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -4074,7 +4074,7 @@ rb_w32_open(const char *file, int oflag, ...)
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);