summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2014-11-25 11:27:12 +0000
committerCorinna Vinschen <corinna@vinschen.de>2014-11-25 11:27:12 +0000
commitd8ba3ea1dba334ac5ac805c26755700e478025a1 (patch)
treea2ddfe7201eba96bb101ff2257ac99e5d190f56e
parent2eda5822dbf225e409ddc6d17d40e21bcfef354d (diff)
downloadcygnal-d8ba3ea1dba334ac5ac805c26755700e478025a1.tar.gz
cygnal-d8ba3ea1dba334ac5ac805c26755700e478025a1.tar.bz2
cygnal-d8ba3ea1dba334ac5ac805c26755700e478025a1.zip
* binmode.c (cygwin_premain0): Don't use underscore'd variants of the
open flags. * textmode.c (cygwin_premain0): Ditto.
-rw-r--r--winsup/cygwin/ChangeLog6
-rw-r--r--winsup/cygwin/binmode.c6
-rw-r--r--winsup/cygwin/textmode.c6
3 files changed, 12 insertions, 6 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 16d836c01..4f66888e2 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-25 Corinna Vinschen <corinna@vinschen.de>
+
+ * binmode.c (cygwin_premain0): Don't use underscore'd variants of the
+ open flags.
+ * textmode.c (cygwin_premain0): Ditto.
+
2014-11-21 Corinna Vinschen <corinna@vinschen.de>
* init.cc (dll_entry): Revert previous patch. This requires another
diff --git a/winsup/cygwin/binmode.c b/winsup/cygwin/binmode.c
index d4673d17d..4c6c2ddba 100644
--- a/winsup/cygwin/binmode.c
+++ b/winsup/cygwin/binmode.c
@@ -1,6 +1,6 @@
/* binmode.c
- Copyright 2000, 2001, 2010, 2013 Red Hat, Inc.
+ Copyright 2000, 2001, 2010, 2013, 2014 Red Hat, Inc.
This file is part of Cygwin.
@@ -18,6 +18,6 @@ cygwin_premain0 (int argc __attribute__ ((unused)),
char **argv __attribute__ ((unused)),
struct per_process *myself __attribute__ ((unused)))
{
- _fmode &= ~_O_TEXT;
- _fmode |= _O_BINARY;
+ _fmode &= ~O_TEXT;
+ _fmode |= O_BINARY;
}
diff --git a/winsup/cygwin/textmode.c b/winsup/cygwin/textmode.c
index 320b75453..e8636bfe9 100644
--- a/winsup/cygwin/textmode.c
+++ b/winsup/cygwin/textmode.c
@@ -1,6 +1,6 @@
/* binmode.c
- Copyright 2000, 2001, 2010, 2013 Red Hat, Inc.
+ Copyright 2000, 2001, 2010, 2013, 2014 Red Hat, Inc.
This file is part of Cygwin.
@@ -18,6 +18,6 @@ cygwin_premain0 (int argc __attribute__ ((unused)),
char **argv __attribute__ ((unused)),
struct per_process *myself __attribute__ ((unused)))
{
- _fmode &= ~_O_BINARY;
- _fmode |= _O_TEXT;
+ _fmode &= ~O_BINARY;
+ _fmode |= O_TEXT;
}