diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 09:40:53 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 09:40:53 +0000 |
| commit | 6fba2e0f015d2d3050543aed3dc1e7880a770019 (patch) | |
| tree | 2eacded47311ff8f5a88de783a334481155a0c7c | |
| parent | 35d07e3fe84bfce6dbd256f70e250d822261dae1 (diff) | |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/win32.c | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -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 @@ -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 345fcdd152..5d79dd17bf 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); |