diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
commit | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (patch) | |
tree | d12ff16d94cffc5d84dba0193eaaa616967c9c2c /defines.h | |
parent | cadac134eda6ed97478afdc528a68dd33f31dbc5 (diff) | |
parent | 1e4cfeee6c17b02af09418c5afe4a4d71aaaf0c8 (diff) |
import openssh-5.3p1-gsskex-all-20100124.patch
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _DEFINES_H | 25 | #ifndef _DEFINES_H |
26 | #define _DEFINES_H | 26 | #define _DEFINES_H |
27 | 27 | ||
28 | /* $Id: defines.h,v 1.153 2009/02/01 11:19:54 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.156 2009/08/28 01:21:07 dtucker Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -300,6 +300,9 @@ struct sockaddr_un { | |||
300 | #ifndef HAVE_IN_ADDR_T | 300 | #ifndef HAVE_IN_ADDR_T |
301 | typedef u_int32_t in_addr_t; | 301 | typedef u_int32_t in_addr_t; |
302 | #endif | 302 | #endif |
303 | #ifndef HAVE_IN_PORT_T | ||
304 | typedef u_int16_t in_port_t; | ||
305 | #endif | ||
303 | 306 | ||
304 | #if defined(BROKEN_SYS_TERMIO_H) && !defined(_STRUCT_WINSIZE) | 307 | #if defined(BROKEN_SYS_TERMIO_H) && !defined(_STRUCT_WINSIZE) |
305 | #define _STRUCT_WINSIZE | 308 | #define _STRUCT_WINSIZE |
@@ -591,6 +594,10 @@ struct winsize { | |||
591 | #define FSID_TO_ULONG(f) \ | 594 | #define FSID_TO_ULONG(f) \ |
592 | ((((u_int64_t)(f).val[0] & 0xffffffffUL) << 32) | \ | 595 | ((((u_int64_t)(f).val[0] & 0xffffffffUL) << 32) | \ |
593 | ((f).val[1] & 0xffffffffUL)) | 596 | ((f).val[1] & 0xffffffffUL)) |
597 | #elif defined(FSID_HAS___VAL) | ||
598 | #define FSID_TO_ULONG(f) \ | ||
599 | ((((u_int64_t)(f).__val[0] & 0xffffffffUL) << 32) | \ | ||
600 | ((f).__val[1] & 0xffffffffUL)) | ||
594 | #else | 601 | #else |
595 | # define FSID_TO_ULONG(f) ((f)) | 602 | # define FSID_TO_ULONG(f) ((f)) |
596 | #endif | 603 | #endif |
@@ -742,4 +749,8 @@ struct winsize { | |||
742 | #define INET6_ADDRSTRLEN 46 | 749 | #define INET6_ADDRSTRLEN 46 |
743 | #endif | 750 | #endif |
744 | 751 | ||
752 | #ifndef SSH_IOBUFSZ | ||
753 | # define SSH_IOBUFSZ 8192 | ||
754 | #endif | ||
755 | |||
745 | #endif /* _DEFINES_H */ | 756 | #endif /* _DEFINES_H */ |