Move FIRST_PTY_LETTER, PTY_ITERATION from src/s to configure

* configure.ac (FIRST_PTY_LETTER PTY_ITERATION): Move here from src/s.

* src/s/aix4-2.h, src/s/bsd-common.h, src/s/cygwin.h, src/s/darwin.h:
* src/s/gnu-linux.h, src/s/hpux10-20.h, src/s/irix6-5.h, src/s/template.h:
* src/s/usg5-4-common.h: Move FIRST_PTY_LETTER, PTY_ITERATION to configure.

10 files changed, 7 insertions, 40 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7b6eaa3820a..19b89259067 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-12  Glenn Morris  <rgm@gnu.org>
+
+        * 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.
+
 2012-07-12  Dmitry Antipov  <dmantipov@yandex.ru>
 
         Use empty_unibyte_string where applicable.
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 4287eea9dcc..326d7217acb 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -28,7 +28,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* In AIX, you allocate a pty by opening /dev/ptc to get the master side.
    To get the name of the slave side, you just ttyname() the master side.  */
-#define PTY_ITERATION int c; for (c = 0; !c ; c++)
 #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptc");
 #define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ttyname (fd));
 
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index 901ed0c490e..681f6599010 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -36,6 +36,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* For mem-limits.h.  */
 #define BSD4_2
-
-/* First pty name is /dev/ptyp0.  */
-#define FIRST_PTY_LETTER 'p'
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index fb5d3b08f4e..89db0a047bc 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -17,7 +17,6 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#define PTY_ITERATION           int i; for (i = 0; i < 1; i++) /* ick */
 #define PTY_NAME_SPRINTF        /* none */
 #define PTY_TTY_NAME_SPRINTF    /* none */
 #define PTY_OPEN                                        \
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 7b4b5e196e3..68667ed7c90 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -30,12 +30,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    distinguish OS X from pure Darwin.  */
 #define DARWIN_OS
 
-/* Letter to use in finding device name of first pty,
-  if system supports pty's.  'a' means it is /dev/ptya0  */
-#define FIRST_PTY_LETTER 'p'
-
-/* Run only once.  We need a `for'-loop because the code uses `continue'.  */
-#define PTY_ITERATION   int i; for (i = 0; i < 1; i++)
 #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.
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 5e8691b55ce..dd4de41f84b 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -28,9 +28,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #if defined HAVE_GRANTPT
 #define UNIX98_PTYS
 
-/* Run only once.  We need a `for'-loop because the code uses `continue'.  */
-#define PTY_ITERATION   int i; for (i = 0; i < 1; i++)
-
 #ifdef HAVE_GETPT
 #define PTY_NAME_SPRINTF
 #define PTY_OPEN fd = getpt ()
@@ -56,13 +53,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
     sigunblock (sigmask (SIGCHLD));                     \
   }
 
-#else /* not HAVE_GRANTPT */
-
-/* Letter to use in finding device name of first pty,
-   if system supports pty's.  'p' means it is /dev/ptyp0  */
-#define FIRST_PTY_LETTER 'p'
-
-#endif  /* not HAVE_GRANTPT */
+#endif  /* HAVE_GRANTPT */
 
 /* Here, on a separate page, add any special hacks needed
    to make Emacs work on this system.  For example,
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 47908c9a4c0..bb81eb800e4 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -24,10 +24,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define USG5
 #define HPUX
 
-/* Letter to use in finding device name of first pty,
-   if system supports pty's.  'p' means it is /dev/ptym/ptyp0  */
-#define FIRST_PTY_LETTER 'p'
-
 /* Special hacks needed to make Emacs run on this system.  */
 
 /* This is how to get the device name of the tty end of a pty.  */
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index dd7a00d0ba7..cd7b2902026 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -26,11 +26,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #undef SETUP_SLAVE_PTY
 
-/* Letter to use in finding device name of first pty,
-   if system supports pty's.  'a' means it is /dev/ptya0  */
-#undef FIRST_PTY_LETTER
-#define FIRST_PTY_LETTER 'q'
-
 /* No need to use sprintf to get the tty name--we get that from _getpty.  */
 #define PTY_TTY_NAME_SPRINTF
 /* No need to get the pty name at all.  */
@@ -39,8 +34,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef emacs
 char *_getpty();
 #endif
-/* We need only try once to open a pty.  */
-#define PTY_ITERATION
 /* Here is how to do it.  */
 #define PTY_OPEN                                            \
 {                                                           \
diff --git a/src/s/template.h b/src/s/template.h
index a343a4b006e..f14890bc292 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -29,10 +29,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* #define BSD4_2 */
 /* #define BSD_SYSTEM */
 
-/* Letter to use in finding device name of first pty,
-   if system supports pty's.  'a' means it is /dev/ptya0.  */
-#define FIRST_PTY_LETTER 'a'
-
 /* subprocesses should be undefined if you do NOT want to
    have code for asynchronous subprocesses
    (as used in M-x compile and M-x shell).
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 561b3ad38ec..94d83dd81ef 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -64,10 +64,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    this is all we need.  */
 #define TIOCSIGSEND TIOCSIGNAL
 
-/* This change means that we don't loop through allocate_pty too many
-   times in the (rare) event of a failure.  */
-#define FIRST_PTY_LETTER 'z'
-
 /* This sets the name of the master side of the PTY.  */
 #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx");