diff options
| author | des <des@FreeBSD.org> | 2004-04-20 09:46:41 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-04-20 09:46:41 +0000 |
| commit | e5d801b2d6aab34943ecb74550a852aa69c82f38 (patch) | |
| tree | 052572b83faf3cab81bed572534efc6912debcbf /crypto/openssh/openbsd-compat | |
| parent | efa35724649769e9a081ef6970590dd0b0a97370 (diff) | |
| download | FreeBSD-src-e5d801b2d6aab34943ecb74550a852aa69c82f38.zip FreeBSD-src-e5d801b2d6aab34943ecb74550a852aa69c82f38.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/openbsd-compat')
| -rw-r--r-- | crypto/openssh/openbsd-compat/fake-rfc2553.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/openssh/openbsd-compat/fake-rfc2553.h b/crypto/openssh/openbsd-compat/fake-rfc2553.h index be93ee8..a19a42f 100644 --- a/crypto/openssh/openbsd-compat/fake-rfc2553.h +++ b/crypto/openssh/openbsd-compat/fake-rfc2553.h @@ -1,5 +1,5 @@ -/* $Id: fake-rfc2553.h,v 1.8 2004/02/10 02:05:41 dtucker Exp $ */ /* $FreeBSD$ */ +/* $Id: fake-rfc2553.h,v 1.8 2004/02/10 02:05:41 dtucker Exp $ */ /* * Copyright (C) 2000-2003 Damien Miller. All rights reserved. @@ -134,6 +134,9 @@ struct addrinfo { #endif /* !HAVE_STRUCT_ADDRINFO */ #ifndef HAVE_GETADDRINFO +#ifdef getaddrinfo +# undef getaddrinfo +#endif #define getaddrinfo(a,b,c,d) (ssh_getaddrinfo(a,b,c,d)) int getaddrinfo(const char *, const char *, const struct addrinfo *, struct addrinfo **); |
