Move PTY_OPEN from src/s to configure

* configure.ac (PTY_OPEN) Move here from src/s.

* src/s/cygwin.h, src/s/darwin.h, src/s/gnu-linux.h, src/s/irix6-5.h:
Move PTY_OPEN to configure.

5 files changed, 3 insertions, 47 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 19b89259067..8ba63959ba4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2012-07-12  Glenn Morris  <rgm@gnu.org>
 
+        * s/cygwin.h, s/darwin.h, s/gnu-linux.h, s/irix6-5.h:
+        Move PTY_OPEN to configure.
+
         * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/darwin.h:
         * s/gnu-linux.h, s/hpux10-20.h, s/irix6-5.h, s/template.h:
         * s/usg5-4-common.h: Move FIRST_PTY_LETTER, PTY_ITERATION to configure.
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 89db0a047bc..79a8999b034 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -19,19 +19,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define PTY_NAME_SPRINTF        /* none */
 #define PTY_TTY_NAME_SPRINTF    /* none */
-#define PTY_OPEN                                        \
-  do                                                    \
-    {                                                   \
-      int dummy;                                        \
-      SIGMASKTYPE mask;                                 \
-      mask = sigblock (sigmask (SIGCHLD));              \
-      if (-1 == openpty (&fd, &dummy, pty_name, 0, 0))  \
-        fd = -1;                                        \
-      sigsetmask (mask);                                \
-      if (fd >= 0)                                      \
-        emacs_close (dummy);                            \
-    }                                                   \
-  while (0)
 
 /* Used in various places to enable cygwin-specific code changes.  */
 #define CYGWIN 1
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 68667ed7c90..569b24e3a6e 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -32,19 +32,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define PTY_NAME_SPRINTF        /* none */
 #define PTY_TTY_NAME_SPRINTF    /* none */
-/* Note that openpty may fork via grantpt on Mac OS X 10.4/Darwin 8.
-   But we don't have to block SIGCHLD because it is blocked in the
-   implementation of grantpt.  */
-#define PTY_OPEN                                                \
-  do                                                            \
-    {                                                           \
-      int slave;                                                \
-      if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1)    \
-        fd = -1;                                                \
-      else                                                      \
-        emacs_close (slave);                                    \
-    }                                                           \
-  while (0)
 
 /* PTYs only work correctly on Darwin 7 or higher.  So make the default
    for process-connection-type dependent on the kernel version.  */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index dd4de41f84b..20a2354a2ab 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -30,7 +30,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_GETPT
 #define PTY_NAME_SPRINTF
-#define PTY_OPEN fd = getpt ()
 #else /* not HAVE_GETPT */
 #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx");
 #endif /* not HAVE_GETPT */
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index cd7b2902026..b053634d17c 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -34,26 +34,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef emacs
 char *_getpty();
 #endif
-/* Here is how to do it.  */
-#define PTY_OPEN                                            \
-{                                                           \
-  struct sigaction ocstat, cstat;                           \
-  struct stat stb;                                          \
-  char * name;                                              \
-  sigemptyset(&cstat.sa_mask);                              \
-  cstat.sa_handler = SIG_DFL;                               \
-  cstat.sa_flags = 0;                                       \
-  sigaction(SIGCLD, &cstat, &ocstat);                       \
-  name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0);         \
-  sigaction(SIGCLD, &ocstat, (struct sigaction *)0);        \
-  if (name == 0)                                            \
-    return -1;                                              \
-  if (fd < 0)                                               \
-    return -1;                                              \
-  if (fstat (fd, &stb) < 0)                                 \
-    return -1;                                              \
-  strcpy (pty_name, name);                                  \
-}
 
 /* Ulimit(UL_GMEMLIM) is busted...  */
 #define ULIMIT_BREAK_VALUE 0x14000000