diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
commit | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (patch) | |
tree | 28fc9a13eaab935e4de055b561b333d67387a934 /openbsd-compat/openbsd-compat.h | |
parent | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
import openssh-4.3p2-gsskex-20060223.patch
Diffstat (limited to 'openbsd-compat/openbsd-compat.h')
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index ba68bc27e..1a3027353 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.30 2005/08/26 20:15:20 tim Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.33 2005/12/31 05:33:37 djm 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. |
@@ -142,6 +142,10 @@ unsigned int arc4random(void); | |||
142 | void arc4random_stir(void); | 142 | void arc4random_stir(void); |
143 | #endif /* !HAVE_ARC4RANDOM */ | 143 | #endif /* !HAVE_ARC4RANDOM */ |
144 | 144 | ||
145 | #ifndef HAVE_ASPRINTF | ||
146 | int asprintf(char **, const char *, ...); | ||
147 | #endif | ||
148 | |||
145 | #ifndef HAVE_OPENPTY | 149 | #ifndef HAVE_OPENPTY |
146 | int openpty(int *, int *, char *, struct termios *, struct winsize *); | 150 | int openpty(int *, int *, char *, struct termios *, struct winsize *); |
147 | #endif /* HAVE_OPENPTY */ | 151 | #endif /* HAVE_OPENPTY */ |
@@ -152,10 +156,18 @@ int openpty(int *, int *, char *, struct termios *, struct winsize *); | |||
152 | int snprintf(char *, size_t, const char *, ...); | 156 | int snprintf(char *, size_t, const char *, ...); |
153 | #endif | 157 | #endif |
154 | 158 | ||
159 | #ifndef HAVE_STRTOLL | ||
160 | long long strtoll(const char *, char **, int); | ||
161 | #endif | ||
162 | |||
155 | #ifndef HAVE_STRTONUM | 163 | #ifndef HAVE_STRTONUM |
156 | long long strtonum(const char *, long long, long long, const char **); | 164 | long long strtonum(const char *, long long, long long, const char **); |
157 | #endif | 165 | #endif |
158 | 166 | ||
167 | #ifndef HAVE_VASPRINTF | ||
168 | int vasprintf(char **, const char *, va_list); | ||
169 | #endif | ||
170 | |||
159 | #ifndef HAVE_VSNPRINTF | 171 | #ifndef HAVE_VSNPRINTF |
160 | int vsnprintf(char *, size_t, const char *, va_list); | 172 | int vsnprintf(char *, size_t, const char *, va_list); |
161 | #endif | 173 | #endif |
@@ -174,5 +186,6 @@ char *shadow_pw(struct passwd *pw); | |||
174 | #include "port-irix.h" | 186 | #include "port-irix.h" |
175 | #include "port-aix.h" | 187 | #include "port-aix.h" |
176 | #include "port-uw.h" | 188 | #include "port-uw.h" |
189 | #include "port-tun.h" | ||
177 | 190 | ||
178 | #endif /* _OPENBSD_COMPAT_H */ | 191 | #endif /* _OPENBSD_COMPAT_H */ |