diff options
| author | des <des@FreeBSD.org> | 2009-10-01 17:12:52 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2009-10-01 17:12:52 +0000 |
| commit | c6a1085feffa5fcd9040272aeae30e7f2466f754 (patch) | |
| tree | 927d2417c80c4c448ee45c25269ecab7af8f482e /crypto/openssh/defines.h | |
| parent | 4f56708582006aca1db129a86ef646499265ee9a (diff) | |
| parent | 98b8242e22b0fc941b830dcec63d235b01bd46a2 (diff) | |
| download | FreeBSD-src-c6a1085feffa5fcd9040272aeae30e7f2466f754.zip FreeBSD-src-c6a1085feffa5fcd9040272aeae30e7f2466f754.tar.gz | |
Upgrade to OpenSSH 5.3p1.
Diffstat (limited to 'crypto/openssh/defines.h')
| -rw-r--r-- | crypto/openssh/defines.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/crypto/openssh/defines.h b/crypto/openssh/defines.h index 536ec49..2ddfd96 100644 --- a/crypto/openssh/defines.h +++ b/crypto/openssh/defines.h @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.153 2009/02/01 11:19:54 dtucker Exp $ */ +/* $Id: defines.h,v 1.156 2009/08/28 01:21:07 dtucker Exp $ */ /* Constants */ @@ -300,6 +300,9 @@ struct sockaddr_un { #ifndef HAVE_IN_ADDR_T typedef u_int32_t in_addr_t; #endif +#ifndef HAVE_IN_PORT_T +typedef u_int16_t in_port_t; +#endif #if defined(BROKEN_SYS_TERMIO_H) && !defined(_STRUCT_WINSIZE) #define _STRUCT_WINSIZE @@ -591,6 +594,10 @@ struct winsize { #define FSID_TO_ULONG(f) \ ((((u_int64_t)(f).val[0] & 0xffffffffUL) << 32) | \ ((f).val[1] & 0xffffffffUL)) +#elif defined(FSID_HAS___VAL) +#define FSID_TO_ULONG(f) \ + ((((u_int64_t)(f).__val[0] & 0xffffffffUL) << 32) | \ + ((f).__val[1] & 0xffffffffUL)) #else # define FSID_TO_ULONG(f) ((f)) #endif @@ -742,4 +749,8 @@ struct winsize { #define INET6_ADDRSTRLEN 46 #endif +#ifndef SSH_IOBUFSZ +# define SSH_IOBUFSZ 8192 +#endif + #endif /* _DEFINES_H */ |
