diff options
author | Colin Watson <cjwatson@debian.org> | 2004-05-01 11:41:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2004-05-01 11:41:25 +0000 |
commit | 915bfea2af69a3bb352a9b4e98e3434b8425124d (patch) | |
tree | ef732498a75f2e13a7a9827edc833dc58bc2a2af /openbsd-compat/fake-rfc2553.h | |
parent | 89e7a2dfe6044f3980098911a7470d401ff70eb1 (diff) | |
parent | 16f1d21ea191deaaeeba719d01c0ad82aa044653 (diff) |
Merge 3.8.1p1 to the trunk, minus RFC.nroff (#211640).
Diffstat (limited to 'openbsd-compat/fake-rfc2553.h')
-rw-r--r-- | openbsd-compat/fake-rfc2553.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h index eb88605fa..baea07038 100644 --- a/openbsd-compat/fake-rfc2553.h +++ b/openbsd-compat/fake-rfc2553.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: fake-rfc2553.h,v 1.8 2004/02/10 02:05:41 dtucker Exp $ */ | 1 | /* $Id: fake-rfc2553.h,v 1.9 2004/03/10 10:06:33 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (C) 2000-2003 Damien Miller. All rights reserved. | 4 | * Copyright (C) 2000-2003 Damien Miller. All rights reserved. |
@@ -133,6 +133,9 @@ struct addrinfo { | |||
133 | #endif /* !HAVE_STRUCT_ADDRINFO */ | 133 | #endif /* !HAVE_STRUCT_ADDRINFO */ |
134 | 134 | ||
135 | #ifndef HAVE_GETADDRINFO | 135 | #ifndef HAVE_GETADDRINFO |
136 | #ifdef getaddrinfo | ||
137 | # undef getaddrinfo | ||
138 | #endif | ||
136 | #define getaddrinfo(a,b,c,d) (ssh_getaddrinfo(a,b,c,d)) | 139 | #define getaddrinfo(a,b,c,d) (ssh_getaddrinfo(a,b,c,d)) |
137 | int getaddrinfo(const char *, const char *, | 140 | int getaddrinfo(const char *, const char *, |
138 | const struct addrinfo *, struct addrinfo **); | 141 | const struct addrinfo *, struct addrinfo **); |