summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKen Brown <kbrown@cornell.edu>2012-04-13 10:50:25 -0400
committerKen Brown <kbrown@cornell.edu>2012-04-13 10:50:25 -0400
commitbcd86815d667681dff8eba8cd376edf2c7f045a2 (patch)
tree8b9846b4113fc548bfa44947816a62d0050ff8b2 /src
parente75e89ba4131339e952dc7628d6b29a31ad377c5 (diff)
* src/s/cygwin.h (PTY_OPEN): Don't try to close a bogus file descriptor.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/s/cygwin.h3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 63cb7a23da4..c23585bdab7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-13 Ken Brown <kbrown@cornell.edu>
+
+ * s/cygwin.h (PTY_OPEN): Don't try to close a bogus file descriptor.
+
2012-04-13 Reuben Thomas <rrt@sc3d.org>
* indent.c (Fmove_to_column): Change interactive spec (Bug#739).
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 70d64a50c4e..f8c656e8ebc 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -58,7 +58,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
if (-1 == openpty (&fd, &dummy, pty_name, 0, 0)) \
fd = -1; \
sigsetmask (mask); \
- emacs_close (dummy); \
+ if (fd >= 0) \
+ emacs_close (dummy); \
} \
while (0)