upstream partial out of memory

1 files changed, 2 insertions, 5 deletions

diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 9a371829eaa..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)
 
@@ -81,10 +82,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define HAVE_SOCKETS
 
-/* vfork() interacts badly with setsid(), causing ptys to fail to
-   change their controlling terminal */
-#define vfork fork
-
 /* This should work (at least when compiling with gcc).  But I have no way
    or intention to verify or even test it.  If you encounter a problem with
    it, feel free to change this setting, but please add a comment here about