summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/fhandler_serial.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 609495c42..43c510186 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
2014-10-20 Corinna Vinschen <corinna@vinschen.de>
+ * fhandler_serial.cc: Revert debug code accidentally checked in on
+ 2014-08-18.
+
+2014-10-20 Corinna Vinschen <corinna@vinschen.de>
+
* path.cc (symlink_info::check): Set error from status code if opening
the parent directory failed, but keep special case for root dirs.
diff --git a/winsup/cygwin/fhandler_serial.cc b/winsup/cygwin/fhandler_serial.cc
index 4e5d488b4..b6641e5e4 100644
--- a/winsup/cygwin/fhandler_serial.cc
+++ b/winsup/cygwin/fhandler_serial.cc
@@ -53,7 +53,7 @@ fhandler_serial::raw_read (void *ptr, size_t& ulen)
ulen, vmin_, vtime_, io_status.hEvent);
if (!overlapped_armed)
{
- SetCommMask (get_handle (), EV_RXCHAR| EV_ERR | EV_BREAK | EV_CTS | EV_DSR | EV_RING | EV_RLSD | EV_RXFLAG);
+ SetCommMask (get_handle (), EV_RXCHAR);
ResetEvent (io_status.hEvent);
}