diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | openbsd-compat/fake-rfc2553.h | 4 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20080225 | ||
2 | - (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack | ||
3 | since it now conflicts with the helper function in misc.c. From | ||
4 | vinschen AT redhat.com. | ||
5 | |||
1 | 20080224 | 6 | 20080224 |
2 | - (tim) [contrib/cygwin/ssh-host-config] | 7 | - (tim) [contrib/cygwin/ssh-host-config] |
3 | Grammar changes on SYSCONFDIR LOCALSTATEDIR messages. | 8 | Grammar changes on SYSCONFDIR LOCALSTATEDIR messages. |
@@ -3616,4 +3621,4 @@ | |||
3616 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3621 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3617 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3622 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3618 | 3623 | ||
3619 | $Id: ChangeLog,v 1.4838 2008/02/25 09:18:31 dtucker Exp $ | 3624 | $Id: ChangeLog,v 1.4839 2008/02/25 09:21:20 dtucker Exp $ |
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h index 5c2ce5b1b..ab9a2af63 100644 --- a/openbsd-compat/fake-rfc2553.h +++ b/openbsd-compat/fake-rfc2553.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: fake-rfc2553.h,v 1.13 2006/07/24 03:51:52 djm Exp $ */ | 1 | /* $Id: fake-rfc2553.h,v 1.14 2008/02/25 09:21:20 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. |
@@ -152,7 +152,7 @@ int getaddrinfo(const char *, const char *, | |||
152 | #endif /* !HAVE_GETADDRINFO */ | 152 | #endif /* !HAVE_GETADDRINFO */ |
153 | 153 | ||
154 | #if !defined(HAVE_GAI_STRERROR) && !defined(HAVE_CONST_GAI_STRERROR_PROTO) | 154 | #if !defined(HAVE_GAI_STRERROR) && !defined(HAVE_CONST_GAI_STRERROR_PROTO) |
155 | #define gai_strerror(a) (ssh_gai_strerror(a)) | 155 | #define gai_strerror(a) (_ssh_compat_gai_strerror(a)) |
156 | char *gai_strerror(int); | 156 | char *gai_strerror(int); |
157 | #endif /* !HAVE_GAI_STRERROR */ | 157 | #endif /* !HAVE_GAI_STRERROR */ |
158 | 158 | ||