diff options
| author | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
| commit | 124c4a14153799ec55cc535db5222b1780208aa1 (patch) | |
| tree | 91bbaf12f7d9b9158ae725f996c95f18038af40c /crypto/openssh/openbsd-compat | |
| parent | 1754c77e5e8ce4ec5f746dc5ce34e4cb54e3130f (diff) | |
| download | FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.zip FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/openbsd-compat')
| -rw-r--r-- | crypto/openssh/openbsd-compat/fake-rfc2553.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/openssh/openbsd-compat/fake-rfc2553.h b/crypto/openssh/openbsd-compat/fake-rfc2553.h index 012db18..be93ee8 100644 --- a/crypto/openssh/openbsd-compat/fake-rfc2553.h +++ b/crypto/openssh/openbsd-compat/fake-rfc2553.h @@ -1,4 +1,4 @@ -/* $Id: fake-rfc2553.h,v 1.6.2.1 2003/09/22 02:09:18 dtucker Exp $ */ +/* $Id: fake-rfc2553.h,v 1.8 2004/02/10 02:05:41 dtucker Exp $ */ /* $FreeBSD$ */ /* @@ -134,19 +134,23 @@ struct addrinfo { #endif /* !HAVE_STRUCT_ADDRINFO */ #ifndef HAVE_GETADDRINFO +#define getaddrinfo(a,b,c,d) (ssh_getaddrinfo(a,b,c,d)) int getaddrinfo(const char *, const char *, const struct addrinfo *, struct addrinfo **); #endif /* !HAVE_GETADDRINFO */ #if !defined(HAVE_GAI_STRERROR) && !defined(HAVE_CONST_GAI_STRERROR_PROTO) +#define gai_strerror(a) (ssh_gai_strerror(a)) char *gai_strerror(int); #endif /* !HAVE_GAI_STRERROR */ #ifndef HAVE_FREEADDRINFO +#define freeaddrinfo(a) (ssh_freeaddrinfo(a)) void freeaddrinfo(struct addrinfo *); #endif /* !HAVE_FREEADDRINFO */ #ifndef HAVE_GETNAMEINFO +#define getnameinfo(a,b,c,d,e,f,g) (ssh_getnameinfo(a,b,c,d,e,f,g)) int getnameinfo(const struct sockaddr *, size_t, char *, size_t, char *, size_t, int); #endif /* !HAVE_GETNAMEINFO */ |
