merge emacs-23

2 files changed, 9 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 514c42cd922..d4130ccdcf8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-09  Peter O'Gorman <pogma@thewrittenword.com>  (tiny change)
+
+        * s/hpux10-20.h (HAVE_TERMIOS, NO_TERMIO, ORDINARY_LINK): New
+        definitions.
+        (HAVE_TERMIO): Remove.
+
 2010-08-06  Kenichi Handa  <handa@m17n.org>
 
         * charset.c: Include <stdlib.h>
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index cf670cd51a0..5d231986010 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -41,12 +41,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define FIRST_PTY_LETTER 'p'
 
-/*
- *      Define HAVE_TERMIO if the system provides sysV-style ioctls
- *      for terminal control.
- */
+#define HAVE_TERMIOS
+#define NO_TERMIO
 
-#define HAVE_TERMIO
+#define ORDINARY_LINK
 
 /*
  *      Define HAVE_PTYS if the system supports pty devices.