diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:42:53 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:42:53 +0000 |
commit | 87552344215a38d3a2b0d4d63dc151e05978bbe1 (patch) | |
tree | 9f4b96055e6ccaa915e8d59d9f2805e9e119371d /openbsd-compat/openbsd-compat.h | |
parent | a25ec0b132c44c9e341e08464ff830de06b81126 (diff) | |
parent | ef94e5613d37bcbf880f21ee6094e4b1c7683a4c (diff) |
import openssh-5.1p1-gsskex-cjwatson-20080722.patch
Diffstat (limited to 'openbsd-compat/openbsd-compat.h')
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 6406af19d..50c6d990b 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.43 2007/06/25 12:15:13 dtucker Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.46 2008/06/08 17:32:29 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -101,6 +101,11 @@ int daemon(int nochdir, int noclose); | |||
101 | char *dirname(const char *path); | 101 | char *dirname(const char *path); |
102 | #endif | 102 | #endif |
103 | 103 | ||
104 | #ifndef HAVE_FMT_SCALED | ||
105 | #define FMT_SCALED_STRSIZE 7 | ||
106 | int fmt_scaled(long long number, char *result); | ||
107 | #endif | ||
108 | |||
104 | #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA) | 109 | #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA) |
105 | char *inet_ntoa(struct in_addr in); | 110 | char *inet_ntoa(struct in_addr in); |
106 | #endif | 111 | #endif |
@@ -139,6 +144,7 @@ int writev(int, struct iovec *, int); | |||
139 | 144 | ||
140 | /* Home grown routines */ | 145 | /* Home grown routines */ |
141 | #include "bsd-misc.h" | 146 | #include "bsd-misc.h" |
147 | #include "bsd-statvfs.h" | ||
142 | #include "bsd-waitpid.h" | 148 | #include "bsd-waitpid.h" |
143 | #include "bsd-poll.h" | 149 | #include "bsd-poll.h" |
144 | 150 | ||
@@ -151,6 +157,14 @@ unsigned int arc4random(void); | |||
151 | void arc4random_stir(void); | 157 | void arc4random_stir(void); |
152 | #endif /* !HAVE_ARC4RANDOM */ | 158 | #endif /* !HAVE_ARC4RANDOM */ |
153 | 159 | ||
160 | #ifndef HAVE_ARC4RANDOM_BUF | ||
161 | void arc4random_buf(void *, size_t); | ||
162 | #endif | ||
163 | |||
164 | #ifndef HAVE_ARC4RANDOM_UNIFORM | ||
165 | u_int32_t arc4random_uniform(u_int32_t); | ||
166 | #endif | ||
167 | |||
154 | #ifndef HAVE_ASPRINTF | 168 | #ifndef HAVE_ASPRINTF |
155 | int asprintf(char **, const char *, ...); | 169 | int asprintf(char **, const char *, ...); |
156 | #endif | 170 | #endif |