aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--io.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 65e7899efb..394a79901d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 11 22:08:24 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (prep_io): fix typo of struct member name.
+ [ruby-core:77550] [Bug #12829]
+
Tue Oct 11 16:45:24 2016 Tanaka Akira <akr@fsij.org>
* lib/uri/generic.rb (URI.find_proxy): Add an optional argument, env.
diff --git a/io.c b/io.c
index 17ec6baa81..35f6fb699b 100644
--- a/io.c
+++ b/io.c
@@ -7375,7 +7375,7 @@ prep_io(int fd, int fmode, VALUE klass, const char *path)
fp->mode = fmode;
if (!io_check_tty(fp)) {
#ifdef __CYGWIN__
- fp->fmode |= FMODE_BINMODE;
+ fp->mode |= FMODE_BINMODE;
setmode(fd, O_BINARY);
#endif
}