From f041bef2c60a092ab4dcae475451729a5345830f Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 7 Dec 2006 03:51:29 +0000
Subject: [PATCH] 2109.   [port]          libbind: silence aix 5.3 compiler
 warnings. [RT #16502]

---
 CHANGES                                |  2 ++
 lib/bind/irs/dns_ho.c                  |  6 +++---
 lib/bind/port/aix5/include/sys/cdefs.h | 10 +++++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4f54a9b691..c74a93e030 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2109.	[port]		libbind: silence aix 5.3 compiler warnings. [RT #16502]
+
 2108.	[func]		DHCID support. [RT #16456]
 
 2107.	[bug]		dighost.c: more cleanup of buffers. [RT #16499]
diff --git a/lib/bind/irs/dns_ho.c b/lib/bind/irs/dns_ho.c
index d586bad32b..d5d75364e1 100644
--- a/lib/bind/irs/dns_ho.c
+++ b/lib/bind/irs/dns_ho.c
@@ -52,7 +52,7 @@
 /* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns_ho.c,v 1.20 2006/03/09 23:57:56 marka Exp $";
+static const char rcsid[] = "$Id: dns_ho.c,v 1.21 2006/12/07 03:51:29 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -937,7 +937,7 @@ gethostans(struct irs_ho *this,
 			bp = (char *)(((u_long)bp + (sizeof(align) - 1)) &
 				      ~(sizeof(align) - 1));
 			/* Avoid overflows. */
-			if (bp + n >= &pvt->hostbuf[sizeof pvt->hostbuf]) {
+			if (bp + n > &pvt->hostbuf[sizeof(pvt->hostbuf) - 1]) {
 				had_error++;
 				continue;
 			}
@@ -1047,7 +1047,7 @@ add_hostent(struct pvt *pvt, char *bp, char **hap, struct addrinfo *ai)
 	bp = (char *)(((u_long)bp + (sizeof(align) - 1)) &
 		      ~(sizeof(align) - 1));
 	/* Avoid overflows. */
-	if (bp + addrlen >= &pvt->hostbuf[sizeof pvt->hostbuf])
+	if (bp + addrlen > &pvt->hostbuf[sizeof(pvt->hostbuf) - 1])
 		return(-1);
 	if (hap >= &pvt->h_addr_ptrs[MAXADDRS-1])
 		return(0); /*%< fail, but not treat it as an error. */
diff --git a/lib/bind/port/aix5/include/sys/cdefs.h b/lib/bind/port/aix5/include/sys/cdefs.h
index b7dfe41930..7e2db88f4a 100644
--- a/lib/bind/port/aix5/include/sys/cdefs.h
+++ b/lib/bind/port/aix5/include/sys/cdefs.h
@@ -55,7 +55,7 @@
 
 /*
  *	@(#)cdefs.h	8.1 (Berkeley) 6/2/93
- *	$Id: cdefs.h,v 1.2 2004/11/30 01:08:52 marka Exp $
+ *	$Id: cdefs.h,v 1.3 2006/12/07 03:51:29 marka Exp $
  */
 
 #ifndef	_CDEFS_H_
@@ -105,10 +105,18 @@
 #define	__STRING(x)	"x"
 
 #ifndef __GNUC__
+#ifndef __const
 #define	__const				/* delete pseudo-ANSI C keywords */
+#endif
+#ifndef __inline
 #define	__inline
+#endif
+#ifndef __signed
 #define	__signed
+#endif
+#ifndef __volatile
 #define	__volatile
+#endif
 /*
  * In non-ANSI C environments, new programs will want ANSI-only C keywords
  * deleted from the program and old programs will want them left alone.