summaryrefslogtreecommitdiffstats
path: root/contrib/bind9
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2006-01-04 19:18:43 +0000
committerdougb <dougb@FreeBSD.org>2006-01-04 19:18:43 +0000
commit998ec2639b9861f903587434ee41b7b8eaa7bba6 (patch)
tree86858e8386f0b6b98339fbc06a210425b786046d /contrib/bind9
parentfbbb1e238e4a3b95dc7db123fce9e4c10f3a7065 (diff)
parentcfe23adacb6eecdaab74e2843766753a4732a86a (diff)
downloadFreeBSD-src-998ec2639b9861f903587434ee41b7b8eaa7bba6.zip
FreeBSD-src-998ec2639b9861f903587434ee41b7b8eaa7bba6.tar.gz
This commit was generated by cvs2svn to compensate for changes in r154032,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/bind9')
-rw-r--r--contrib/bind9/lib/bind/irs/getaddrinfo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/bind9/lib/bind/irs/getaddrinfo.c b/contrib/bind9/lib/bind/irs/getaddrinfo.c
index 4f741a8..d80f298 100644
--- a/contrib/bind9/lib/bind/irs/getaddrinfo.c
+++ b/contrib/bind9/lib/bind/irs/getaddrinfo.c
@@ -332,7 +332,7 @@ getaddrinfo(hostname, servname, hints, res)
pai->ai_family = PF_UNSPEC;
pai->ai_socktype = ANY;
pai->ai_protocol = ANY;
-#ifdef __sparcv9
+#if defined(sun) && defined(_SOCKLEN_T) && defined(__sparcv9)
/*
* clear _ai_pad to preserve binary
* compatibility with previously compiled 64-bit
@@ -340,7 +340,7 @@ getaddrinfo(hostname, servname, hints, res)
* guaranteeing the upper 32-bits are empty.
*/
pai->_ai_pad = 0;
-#endif /* __sparcv9 */
+#endif
pai->ai_addrlen = 0;
pai->ai_canonname = NULL;
pai->ai_addr = NULL;
@@ -365,7 +365,7 @@ getaddrinfo(hostname, servname, hints, res)
}
memcpy(pai, hints, sizeof(*pai));
-#ifdef __sparcv9
+#if defined(sun) && defined(_SOCKLEN_T) && defined(__sparcv9)
/*
* We need to clear _ai_pad to preserve binary
* compatibility. See prior comment.
OpenPOWER on IntegriCloud