Mostly, this changes all the "#if defined(ENCRYPTION)"

[unix-history] / usr / src / usr.bin / telnet / externs.h

diff --git a/usr/src/usr.bin/telnet/externs.h b/usr/src/usr.bin/telnet/externs.h
index 5e99c28..1afb89c 100644 (file)
--- a/usr/src/usr.bin/telnet/externs.h
+++ b/usr/src/usr.bin/telnet/externs.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)externs.h   5.4 (Berkeley) %G%
+ *     @(#)externs.h   5.7 (Berkeley) %G%

  */
 
 #ifndef        BSD
  */
 
 #ifndef        BSD


@@ -24,11 +24,17 @@
 
 #include <stdio.h>
 #include <setjmp.h>
 
 #include <stdio.h>
 #include <setjmp.h>

+#if defined(CRAY) && !defined(NO_BSD_SETJMP)
+#include <bsdsetjmp.h>
+#endif

 #ifndef        FILIO_H
 #include <sys/ioctl.h>
 #else
 #include <sys/filio.h>
 #endif
 #ifndef        FILIO_H
 #include <sys/ioctl.h>
 #else
 #include <sys/filio.h>
 #endif

+#ifdef CRAY
+# include <errno.h>
+#endif /* CRAY */

 #ifdef USE_TERMIO
 # ifndef       VINTR
 #  ifdef SYSV_TERMIO
 #ifdef USE_TERMIO
 # ifndef       VINTR
 #  ifdef SYSV_TERMIO


@@ -65,7 +71,9 @@ typedef unsigned char cc_t;
 
 #define        SUBBUFSIZE      256
 
 
 #define        SUBBUFSIZE      256
 

+#ifndef CRAY

 extern int errno;              /* outside this world */
 extern int errno;              /* outside this world */

+#endif /* !CRAY */

 
 #if    !defined(P)
 # ifdef        __STDC__
 
 #if    !defined(P)
 # ifdef        __STDC__


@@ -126,10 +134,10 @@ extern char
     wont[],
     options[],         /* All the little options */
     *hostname;         /* Who are we connected to? */
     wont[],
     options[],         /* All the little options */
     *hostname;         /* Who are we connected to? */

-#if    defined(ENCRYPTION)
+#ifdef ENCRYPTION

 extern void (*encrypt_output) P((unsigned char *, int));
 extern int (*decrypt_input) P((int));
 extern void (*encrypt_output) P((unsigned char *, int));
 extern int (*decrypt_input) P((int));

-#endif
+#endif /* ENCRYPTION */

 
 /*
  * We keep track of each side of the option negotiation.
 
 /*
  * We keep track of each side of the option negotiation.


@@ -227,6 +235,12 @@ extern void
     willoption P((int)),
     wontoption P((int));
 
     willoption P((int)),
     wontoption P((int));
 

+extern void
+    send_do P((int, int)),
+    send_dont P((int, int)),
+    send_will P((int, int)),
+    send_wont P((int, int));
+

 extern void
     lm_will P((unsigned char *, int)),
     lm_wont P((unsigned char *, int)),
 extern void
     lm_will P((unsigned char *, int)),
     lm_wont P((unsigned char *, int)),


@@ -431,9 +445,9 @@ extern char
     tline[],
     *transcom;         /* Transparent command */
 
     tline[],
     *transcom;         /* Transparent command */
 

-extern int
+extern void

     settranscom P((int, char**));
 
 extern void
     settranscom P((int, char**));
 
 extern void

-    inputAvailable P((void));
+    inputAvailable P((int));

 #endif /* defined(TN3270) */
 #endif /* defined(TN3270) */