diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2004-03-10 21:06:32 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2004-03-10 21:06:32 +1100 |
| commit | 7c991ab1e1ea69125de51fc650369ff14c1d6fd7 (patch) | |
| tree | e7eae2d14f00be6c772802302eecce317078e611 | |
| parent | aa5383243d7347302a82f29809a788b43b3ff837 (diff) | |
- (dtucker) [openbsd-compat/fake-rfc2553.h] Bug #812: #undef getaddrinfo
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@ @@ -891,4 +895,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3286 2004/03/08 20:12:18 tim Exp $ +$Id: ChangeLog,v 1.3287 2004/03/10 10:06:32 dtucker Exp $ diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h index eb88605f..baea0703 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.9 2004/03/10 10:06:33 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 **); |