diff options
author | dtucker <dtucker> | 2004-03-10 10:05:42 +0000 |
---|---|---|
committer | dtucker <dtucker> | 2004-03-10 10:05:42 +0000 |
commit | b3147afcdf21abf4a7c62c4fc66595a8b25a1354 (patch) | |
tree | 65dac8897fc10e451141e3030663b70c4458bebd | |
parent | 4e10fb87a9543dd2292635728413281dad93cca7 (diff) | |
download | openssh-V_3_8.tar.gz |
- (dtucker) [openbsd-compat/fake-rfc2553.h] Bug #812: #undef getaddrinfoV_3_8
before redefining it, silences warnings on Tru64.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | openbsd-compat/fake-rfc2553.h | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,7 @@ +20040310 + - (dtucker) [openbsd-compat/fake-rfc2553.h] Bug #812: #undef getaddrinfo + before redefining it, silences warnings on Tru64. + 20040308 - (dtucker) [sshd.c] Back out rev 1.270 as it caused problems on some platforms (eg SCO, HP-UX) with logging in the wrong TZ. ok djm@ @@ -1953,4 +1957,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3257.2.7 2004/03/08 12:02:13 dtucker Exp $ +$Id: ChangeLog,v 1.3257.2.8 2004/03/10 10:05:42 dtucker Exp $ diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h index eb88605f..a165a15d 100644 --- a/openbsd-compat/fake-rfc2553.h +++ b/openbsd-compat/fake-rfc2553.h @@ -1,4 +1,4 @@ -/* $Id: fake-rfc2553.h,v 1.8 2004/02/10 02:05:41 dtucker Exp $ */ +/* $Id: fake-rfc2553.h,v 1.8.2.1 2004/03/10 10:05:43 dtucker Exp $ */ /* * Copyright (C) 2000-2003 Damien Miller. All rights reserved. @@ -133,6 +133,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 **); |