From d923262186a3111a6ac7aae5dcd9996e01115a44 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 15 Jul 2008 00:21:16 +0000
Subject: [PATCH] 2387.   [bug]           Silence compiler warnings in
 lib/isc/radix.c.                         [RT #18147] [RT #18258]

---
 CHANGES         | 3 +++
 lib/isc/radix.c | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index f27f098209..17568c318b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2387.	[bug]		Silence compiler warnings in lib/isc/radix.c.
+			[RT #18147] [RT #18258]
+
 2386.	[func]		Add warning about too small 'open files' limit.
 			[RT #18269]
 
diff --git a/lib/isc/radix.c b/lib/isc/radix.c
index ee0c815811..95f8f54e8f 100644
--- a/lib/isc/radix.c
+++ b/lib/isc/radix.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: radix.c,v 1.14 2008/05/21 23:21:33 each Exp $ */
+/* $Id: radix.c,v 1.15 2008/07/15 00:21:16 marka Exp $ */
 
 /*
  * This source was adapted from MRT's RCS Ids:
@@ -22,6 +22,8 @@
  * Id: prefix.c,v 1.37.2.9 2000/03/10 02:53:19 labovit Exp
  */
 
+#include <config.h>
+
 #include <isc/mem.h>
 #include <isc/types.h>
 #include <isc/util.h>
@@ -233,7 +235,8 @@ isc_radix_search(isc_radix_tree_t *radix, isc_radix_node_t **target,
 	isc_radix_node_t *node;
 	isc_radix_node_t *stack[RADIX_MAXBITS + 1];
 	u_char *addr;
-	isc_uint32_t bitlen, family, tfamily = -1;
+	isc_uint32_t bitlen;
+	int family, tfamily = -1;
 	int cnt = 0;
 
 	REQUIRE(radix != NULL);