===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/externs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/telnet/externs.h	1995/10/18 08:46:14	1.1
--- src/usr.bin/telnet/externs.h	1996/03/27 19:33:01	1.2
***************
*** 1,3 ****
--- 1,6 ----
+ /*	$OpenBSD: externs.h,v 1.2 1996/03/27 19:33:01 niklas Exp $	*/
+ /*	$NetBSD: externs.h,v 1.8 1996/02/28 21:03:58 thorpej Exp $	*/
+ 
  /*
   * Copyright (c) 1988, 1990, 1993
   *	The Regents of the University of California.  All rights reserved.
***************
*** 30,37 ****
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   *
!  *	from: @(#)externs.h	8.1 (Berkeley) 6/6/93
!  *	$Id: externs.h,v 1.1 1995/10/18 08:46:14 deraadt Exp $
   */
  
  #ifndef	BSD
--- 33,39 ----
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   *
!  *	from: @(#)externs.h	8.3 (Berkeley) 5/30/95
   */
  
  #ifndef	BSD
***************
*** 85,92 ****
  
  #ifndef	NO_STRING_H
  #include <string.h>
! #endif
  #include <strings.h>
  
  #ifndef	_POSIX_VDISABLE
  # ifdef sun
--- 87,95 ----
  
  #ifndef	NO_STRING_H
  #include <string.h>
! #else
  #include <strings.h>
+ #endif
  
  #ifndef	_POSIX_VDISABLE
  # ifdef sun
***************
*** 105,117 ****
  extern int errno;		/* outside this world */
  #endif /* !CRAY */
  
! #if	!defined(P)
! # ifdef	__STDC__
! #  define	P(x)	x
! # else
! #  define	P(x)	()
! # endif
! #endif
  
  extern int
      autologin,		/* Autologin enabled */
--- 108,115 ----
  extern int errno;		/* outside this world */
  #endif /* !CRAY */
  
! #include <sys/cdefs.h>
! #define P __P
  
  extern int
      autologin,		/* Autologin enabled */
***************
*** 120,131 ****
      flushout,		/* flush output */
      connected,		/* Are we connected to the other side? */
      globalmode,		/* Mode tty should be in */
!     In3270,			/* Are we in 3270 mode? */
      telnetport,		/* Are we connected to the telnet port? */
      localflow,		/* Flow control handled locally */
      restartany,		/* If flow control, restart output on any character */
      localchars,		/* we recognize interrupt/quit */
!     donelclchars,		/* the user has set "localchars" */
      showoptions,
      net,		/* Network file descriptor */
      tin,		/* Terminal input file descriptor */
--- 118,129 ----
      flushout,		/* flush output */
      connected,		/* Are we connected to the other side? */
      globalmode,		/* Mode tty should be in */
!     In3270,		/* Are we in 3270 mode? */
      telnetport,		/* Are we connected to the telnet port? */
      localflow,		/* Flow control handled locally */
      restartany,		/* If flow control, restart output on any character */
      localchars,		/* we recognize interrupt/quit */
!     donelclchars,	/* the user has set "localchars" */
      showoptions,
      net,		/* Network file descriptor */
      tin,		/* Terminal input file descriptor */
***************
*** 146,152 ****
  #endif	/* defined(TN3270) */
      termdata,		/* Print out terminal data flow */
  #endif	/* defined(unix) */
!     debug,			/* Debug level */
      clienteof;		/* Client received EOF */
  
  extern cc_t escape;	/* Escape to command mode */
--- 144,150 ----
  #endif	/* defined(TN3270) */
      termdata,		/* Print out terminal data flow */
  #endif	/* defined(unix) */
!     debug,		/* Debug level */
      clienteof;		/* Client received EOF */
  
  extern cc_t escape;	/* Escape to command mode */