Merge from trunk

4 files changed, 4 insertions, 10 deletions

diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 84920f888e1..0a3d48db639 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -55,10 +55,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Special items needed to make Emacs run on this system.  */
 
-/* The following definition seems to be needed in AIX version 3.1.6.8.
-   It may not have been needed in certain earlier versions.  */
-#define HAVE_TCATTR
-
 /* AIX doesn't define this.  */
 #define unix 1
 
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index ee0fa9abe02..d34ff16104b 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -35,9 +35,10 @@ 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_TERMIO if the system provides sysV-style ioctls
-   for terminal control.  */
-#define HAVE_TERMIO
+#define HAVE_TERMIOS
+#define NO_TERMIO
+
+#define ORDINARY_LINK
 
 /* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index f61fae57eff..4ae5f32e873 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -106,7 +106,6 @@ struct sigaction {
 #define HAVE_SOUND  1
 #define LISP_FLOAT_TYPE 1
 
-#undef  HAVE_SYS_SELECT_H
 #define HAVE_SYS_TIMEB_H 1
 #define HAVE_SYS_TIME_H 1
 #define HAVE_UNISTD_H 1
diff --git a/src/s/unixware.h b/src/s/unixware.h
index ac989d48e2c..81b1b3d97fa 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -21,8 +21,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "usg5-4-common.h"
 
-/* fnf@cygnus.com says these exist.  */
-#define HAVE_TCATTR
 /* #define HAVE_GETWD  (appears to be buggy on SVR4.2) */
 #undef HAVE_GETWD