Changes for pyramid from sbanner1@cheops (S. John Banner).

SCCS-vsn: usr.bin/tn3270/telnet.c 6.6
SCCS-vsn: usr.bin/tn3270/sys_curses/system.c 3.2
SCCS-vsn: usr.bin/tn3270/ctlr/api.h 3.2

diff --git a/usr/src/usr.bin/tn3270/ctlr/api.h b/usr/src/usr.bin/tn3270/ctlr/api.h
index 5b29fb3..937cb3a 100644 (file)
--- a/usr/src/usr.bin/tn3270/ctlr/api.h
+++ b/usr/src/usr.bin/tn3270/ctlr/api.h
@@ -1,7 +1,7 @@
 /*
  * This file contains header information used by the PC API routines.
  *
 /*
  * This file contains header information used by the PC API routines.
  *

- * @(#)api.h   3.1 (Berkeley) %G%
+ * @(#)api.h   3.2 (Berkeley) %G%

  */
 
 #if    !defined(MSDOS)
  */
 
 #if    !defined(MSDOS)


@@ -308,7 +308,7 @@ struct highlow {
        dl,
        dh;
 #endif /* defined(vax) */
        dl,
        dh;
 #endif /* defined(vax) */

-#if    defined(sun) || defined(tahoe) || defined(ibm032)
+#if    defined(sun) || defined(tahoe) || defined(ibm032) || defined(pyr)

        ah,
        al,
        bh,
        ah,
        al,
        bh,

diff --git a/usr/src/usr.bin/tn3270/sys_curses/system.c b/usr/src/usr.bin/tn3270/sys_curses/system.c
index f25ce7f..a64e92f 100644 (file)
--- a/usr/src/usr.bin/tn3270/sys_curses/system.c
+++ b/usr/src/usr.bin/tn3270/sys_curses/system.c
@@ -20,12 +20,16 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)system.c   3.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)system.c   3.2 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 
 #endif /* not lint */
 
 #include <sys/types.h>
 

-#if    !defined(sun)
+#if     defined(pyr)
+#define fd_set fdset_t
+#endif  /* defined(pyr) */
+
+#if    !defined(sun) && !defined(pyr)

 #include <sys/inode.h>
 #else  /* !defined(sun) */
 #define        IREAD   00400
 #include <sys/inode.h>
 #else  /* !defined(sun) */
 #define        IREAD   00400

diff --git a/usr/src/usr.bin/tn3270/telnet.c b/usr/src/usr.bin/tn3270/telnet.c
index fa7d78a..b116356 100644 (file)
--- a/usr/src/usr.bin/tn3270/telnet.c
+++ b/usr/src/usr.bin/tn3270/telnet.c
@@ -26,7 +26,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)telnet.c   6.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)telnet.c   6.6 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -79,6 +79,11 @@ void setcommandmode(), command();    /* forward declarations */
 #endif /* !defined(TN3270) */
 
 #include <sys/types.h>
 #endif /* !defined(TN3270) */
 
 #include <sys/types.h>

+
+#if     defined(pyr)
+#define fd_set fdset_t
+#endif  /* defined(pyr) */
+ 

 #include <sys/socket.h>
 
 #include <netinet/in.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>