Merge from emacs-24; up to 2012-04-21T14:12:27Z!sdl.web@gmail.com

[gnu-emacs] / src / s / cygwin.h

diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index af5308ff7bbbb3185804ea938c5c47ec09d49741..9310890351e3e4fb42e25fe94a0d1c3f9b364e10 100644 (file)
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -1,6 +1,6 @@
 /* System description header file for Cygwin.
 
-Copyright (C) 1985-1986, 1992, 1999, 2002-2011 Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 1992, 1999, 2002-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -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,19 +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
-   why it needed to be changed.  */
-#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
-/* Virtual addresses of pure and impure space can vary, as on Windows.  */
-#define VIRT_ADDR_VARIES
-
 /* Emacs supplies its own malloc, but glib (part of Gtk+) calls
    memalign and on Cygwin, that becomes the Cygwin-supplied memalign.
    As malloc is not the Cygwin malloc, the Cygwin memalign always