9 files changed, 12 insertions, 51 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0538d1a38bf..341649fbe68 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,17 @@
 2010-09-20  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        Remove HAVE_TERMIOS definitions.
+        * s/usg5-4-common.h (HAVE_TERMIOS):
+        * s/template.h (HAVE_TERMIOS):
+        * s/gnu-linux.h (HAVE_TERMIOS):
+        * s/darwin.h (HAVE_TERMIOS):
+        * s/cygwin.h (HAVE_TERMIOS):
+        * s/bsd-common.h (HAVE_TERMIOS):
+        * s/aix4-2.h (HAVE_TERMIOS):
+        * s/hpux10-20.h (HAVE_TERMIOS): Do not define, it is assumed
+        defined on all non-MS platforms.
+        (HAVE_PSTAT_GETDYNAMIC): Do not define, autoconf does it.
+
         * xterm.c (xt_action_hook): Use const.
 
 2010-09-20  Juanma Barranquero  <lekktu@gmail.com>
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 0a3d48db639..29702028649 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -37,10 +37,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptc");
 #define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ttyname (fd));
 
-/* Define HAVE_TERMIO if the system provides sysV-style ioctls
-   for terminal control.  */
-#define HAVE_TERMIOS
-
 /* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index bf78f4ec347..b17ca7a012f 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -42,7 +42,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef KERNEL_FILE
 #undef LDAV_SYMBOL
 
-#define HAVE_TERMIOS
 #define NO_TERMIO
 
 /* If the system's imake configuration file defines `NeedWidePrototypes'
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 1b78ada53bd..4d58542e660 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -45,16 +45,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    through a pipe. */
 #undef INTERRUPT_INPUT
 
-/* Define HAVE_TERMIOS if the system provides POSIX-style
-   functions and macros for terminal control.
-
-   Define HAVE_TERMIO if the system provides sysV-style ioctls
-   for terminal control.
-
-   Do not define both.  HAVE_TERMIOS is preferred, if it is
-   supported on your system.  */
-#define HAVE_TERMIOS
-
 /* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 #define PTY_ITERATION           for (i = 0; i < 1; i++) /* ick */
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 146bfd693a2..73e19602275 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -63,15 +63,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   if system supports pty's.  'a' means it is /dev/ptya0  */
 #define FIRST_PTY_LETTER 'p'
 
-/* Define HAVE_TERMIOS if the system provides POSIX-style
-   functions and macros for terminal control.
-
-   Define HAVE_TERMIO if the system provides sysV-style ioctls
-   for terminal control.
-
-   Do not define both.  HAVE_TERMIOS is preferred, if it is supported
-   on your system. */
-#define HAVE_TERMIOS
 #define NO_TERMIO
 
 /* Define HAVE_PTYS if the system supports pty devices.
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index cf3b3079726..9327423b42f 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -80,10 +80,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #endif  /* not HAVE_GRANTPT */
 
-/*  Define HAVE_TERMIOS if the system provides POSIX-style
-    functions and macros for terminal control.  */
-#define HAVE_TERMIOS
-
 /* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index d34ff16104b..0932e6f7112 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -35,11 +35,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    if system supports pty's.  'p' means it is /dev/ptym/ptyp0  */
 #define FIRST_PTY_LETTER 'p'
 
-#define HAVE_TERMIOS
 #define NO_TERMIO
 
-#define ORDINARY_LINK
-
 /* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 
@@ -78,9 +75,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    HP-UX 10.20, and that it works for HP-UX 0 as well.  */
 #define NO_EDITRES
 
-/* Tested in getloadavg.c.  */
-#define HAVE_PSTAT_GETDYNAMIC
-
 /* Eric Backus <ericb@lsid.hp.com> says, HP-UX 9.x on HP 700 machines
    has a broken `rint' in some library versions including math library
    version number A.09.05.
diff --git a/src/s/template.h b/src/s/template.h
index dd1e56f8553..eb7ca85c5e5 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -63,18 +63,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    if system supports pty's.  'a' means it is /dev/ptya0.  */
 #define FIRST_PTY_LETTER 'a'
 
-/* Define HAVE_TERMIOS if the system provides POSIX-style
-   functions and macros for terminal control.
-
-   Define HAVE_TERMIO if the system provides sysV-style ioctls
-   for terminal control.
-
-   Do not define both.  HAVE_TERMIOS is preferred, if it is
-   supported on your system.  */
-
-#define HAVE_TERMIOS
-/* #define HAVE_TERMIO */
-
 /* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 7ff5c6f7be3..4dcb8e50200 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -31,10 +31,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "usg-unix-v"
 
-/* Define HAVE_TERMIO if the system provides sysV-style ioctls
-   for terminal control.  */
-#define HAVE_TERMIO
-
 /* The file containing the kernel's symbol table is called /unix.  */
 #define KERNEL_FILE "/unix"
 
@@ -78,7 +74,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
-#define HAVE_TERMIOS
 
 /* It is possible to receive SIGCHLD when there are no children
    waiting, because a previous waitsys(2) cleaned up the carcass of child