diff options
author | des <des@FreeBSD.org> | 2002-06-29 11:48:59 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2002-06-29 11:48:59 +0000 |
commit | 72a8e501f778fe56e3ec3c32d99f77e20b9b24be (patch) | |
tree | 038040484c6082020b918a9c208a38e77fd09e7d /crypto/openssh/session.h | |
parent | 96f831106bfe6170a73a8112d39a8b123156c6f2 (diff) | |
download | FreeBSD-src-72a8e501f778fe56e3ec3c32d99f77e20b9b24be.zip FreeBSD-src-72a8e501f778fe56e3ec3c32d99f77e20b9b24be.tar.gz |
Resolve conflicts.
Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'crypto/openssh/session.h')
-rw-r--r-- | crypto/openssh/session.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/openssh/session.h b/crypto/openssh/session.h index 2a7e4b2..cd1c8c3 100644 --- a/crypto/openssh/session.h +++ b/crypto/openssh/session.h @@ -1,4 +1,5 @@ -/* $OpenBSD: session.h,v 1.17 2002/03/29 18:59:32 markus Exp $ */ +/* $OpenBSD: session.h,v 1.18 2002/06/23 21:06:41 deraadt Exp $ */ +/* $FreeBSD$ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -37,15 +38,15 @@ struct Session { /* tty */ char *term; int ptyfd, ttyfd, ptymaster; - int row, col, xpixel, ypixel; + u_int row, col, xpixel, ypixel; char tty[TTYSZ]; /* last login */ char hostname[MAXHOSTNAMELEN]; time_t last_login_time; /* X11 */ - int display_number; + u_int display_number; char *display; - int screen; + u_int screen; char *auth_display; char *auth_proto; char *auth_data; |