diff options
author | dtucker <dtucker> | 2004-02-10 02:05:40 +0000 |
---|---|---|
committer | dtucker <dtucker> | 2004-02-10 02:05:40 +0000 |
commit | 3128a428e9454a9a4cb87ed83cfba5e24a5966b0 (patch) | |
tree | ccad404e8c5c8774877646d740f3c9cbecf8cc53 /openbsd-compat/fake-rfc2553.h | |
parent | a193cf3b457cf6486e58cb569d394ecb5f055cef (diff) | |
download | openssh-3128a428e9454a9a4cb87ed83cfba5e24a5966b0.tar.gz |
- (dtucker) [openbsd-compat/fake-rfc2553.h] Bug #563: Prepend ssh_ to compat
functions to avoid conflicts with Heimdal's libroken. ok djm@
Diffstat (limited to 'openbsd-compat/fake-rfc2553.h')
-rw-r--r-- | openbsd-compat/fake-rfc2553.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h index bf727cea..eb88605f 100644 --- a/openbsd-compat/fake-rfc2553.h +++ b/openbsd-compat/fake-rfc2553.h @@ -1,4 +1,4 @@ -/* $Id: fake-rfc2553.h,v 1.7 2003/09/22 02:08:23 dtucker Exp $ */ +/* $Id: fake-rfc2553.h,v 1.8 2004/02/10 02:05:41 dtucker Exp $ */ /* * Copyright (C) 2000-2003 Damien Miller. All rights reserved. @@ -133,19 +133,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 */ |