summaryrefslogtreecommitdiff
path: root/src/s
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-08-22 16:02:16 -0400
committerChong Yidong <cyd@stupidchicken.com>2010-08-22 16:02:16 -0400
commitb0126eac41487b9bca5af5cbb2212ff5b2c58b80 (patch)
tree680ba932d259776ebfdb6d424fa8f668e1001f7c /src/s
parentb613941ba003bbf5024415ac4f8c2a0e12434751 (diff)
parentbc7d7ea63ba9d98b3ecc3b6decf4392a651dcbfb (diff)
downloademacs-b0126eac41487b9bca5af5cbb2212ff5b2c58b80.tar.gz
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/s')
-rw-r--r--src/s/hpux10-20.h7
1 files changed, 4 insertions, 3 deletions
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