From fa68327632b42e4bd7833640e3a3eb4df85a8066 Mon Sep 17 00:00:00 2001 From: "jdunn%netscape.com" Date: Thu, 5 Apr 2001 11:03:15 +0000 Subject: [PATCH] adding changes to make xmlterm build on hpux11 r= svn@xmlterm.org # 54160 git-svn-id: svn://10.0.0.236/trunk@91446 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/xmlterm/Makefile.in | 2 +- mozilla/extensions/xmlterm/base/ptystream.c | 5 ++++- mozilla/extensions/xmlterm/linetest/lterm.c | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mozilla/extensions/xmlterm/Makefile.in b/mozilla/extensions/xmlterm/Makefile.in index 170bbba5087..5fc038ec946 100644 --- a/mozilla/extensions/xmlterm/Makefile.in +++ b/mozilla/extensions/xmlterm/Makefile.in @@ -69,7 +69,7 @@ DIRS = base tests linetest else # not STAND_ALONE # XMLterm currently works on Linux and SunOS only (testing on BSD family) -ifneq (,$(filter Linux SunOS FreeBSD,$(OS_ARCH))) +ifneq (,$(filter Linux SunOS FreeBSD HP-UX,$(OS_ARCH))) DIRS = base ui scripts doc tests else # XMLterm not yet been ported to this platform; do nothing DIRS = diff --git a/mozilla/extensions/xmlterm/base/ptystream.c b/mozilla/extensions/xmlterm/base/ptystream.c index 2d9656fa79e..de5567f890a 100644 --- a/mozilla/extensions/xmlterm/base/ptystream.c +++ b/mozilla/extensions/xmlterm/base/ptystream.c @@ -51,7 +51,7 @@ #include #include -#if defined(LINUX) || defined(BSDFAMILY) +#if defined(LINUX) || defined(BSDFAMILY) || defined(HPUX11) #include #endif @@ -438,6 +438,7 @@ static int setTTYAttr(int ttyFD, int noecho) pty_error("setTTYattr: Failed to get TTY attributes", NULL); return -1; } + memset(&tios, 0, sizeof(struct termios)); /* TERMIOS settings for TTY */ tios.c_cc[VINTR] = C_CTL_C; @@ -453,8 +454,10 @@ static int setTTYAttr(int ttyFD, int noecho) tios.c_cc[VSTART] = C_CTL_Q; tios.c_cc[VSTOP] = C_CTL_S; tios.c_cc[VSUSP] = C_CTL_Z; +#ifndef HPUX11 tios.c_cc[VREPRINT] = C_CTL_R; tios.c_cc[VDISCARD] = C_CTL_O; +#endif /* !HPUX11 */ tios.c_cc[VWERASE] = C_CTL_W; tios.c_cc[VLNEXT] = C_CTL_V; diff --git a/mozilla/extensions/xmlterm/linetest/lterm.c b/mozilla/extensions/xmlterm/linetest/lterm.c index 576c1c913e8..4bc0364c4bb 100644 --- a/mozilla/extensions/xmlterm/linetest/lterm.c +++ b/mozilla/extensions/xmlterm/linetest/lterm.c @@ -52,7 +52,10 @@ #include #endif +#ifndef _REENTRANT #define _REENTRANT +#endif /* !_REENTRANT */ + #include #ifdef SOLARIS