summaryrefslogtreecommitdiff
path: root/defines.h
diff options
context:
space:
mode:
Diffstat (limited to 'defines.h')
-rw-r--r--defines.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/defines.h b/defines.h
index 536ec4978..2ddfd96d0 100644
--- a/defines.h
+++ b/defines.h
@@ -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
301typedef u_int32_t in_addr_t; 301typedef u_int32_t in_addr_t;
302#endif 302#endif
303#ifndef HAVE_IN_PORT_T
304typedef 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 */