From c4d29896d33a7df17d7f8ec7383dff1f6b2161f0 Mon Sep 17 00:00:00 2001
From: Shane Kerr <shane@isc.org>
Date: Fri, 11 Jan 2008 14:00:06 +0000
Subject: [PATCH] Build fix for OS X Leopard (10.5). See RT ticket #17406.

---
 RELNOTES                  |  2 ++
 includes/minires/resolv.h |  4 +++-
 minires/res_send.c        | 16 +++++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/RELNOTES b/RELNOTES
index bac9425a7..ae3bd6539 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -110,6 +110,8 @@ suggested fixes to <dhcp-users@isc.org>.
 
 - Fixes to allow code to compile and run on Solaris 9.
 
+- Fixes to allow code to compile on Mac OS X Leopard (10.5).
+
 			Changes since 4.0.0b3
 
 - The reverse dns name for PTR updates on IPv6 addresses has been fixed to
diff --git a/includes/minires/resolv.h b/includes/minires/resolv.h
index ad7759c56..196942199 100644
--- a/includes/minires/resolv.h
+++ b/includes/minires/resolv.h
@@ -56,12 +56,14 @@
 
 /*
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	$Id: resolv.h,v 1.4 2005/03/17 20:15:15 dhankins Exp $
+ *	$Id: resolv.h,v 1.5 2008/01/11 14:00:06 shane Exp $
  */
 
 #ifndef _RESOLV_H_
 #define	_RESOLV_H_
 
+#include <sys/types.h>
+
 /*
  * This used to be defined in res_query.c, now it's in herror.c.
  * [XXX no it's not.  It's in irs/irs_data.c]
diff --git a/minires/res_send.c b/minires/res_send.c
index 31641e5eb..ab9d089f7 100644
--- a/minires/res_send.c
+++ b/minires/res_send.c
@@ -76,10 +76,24 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.8 2005/03/17 20:15:19 dhankins Exp $";
+static const char rcsid[] = "$Id: res_send.c,v 1.9 2008/01/11 14:00:06 shane Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Rename the I/O functions in case we're tracing. */
+#include <omapip/omapip_p.h>
+
+ssize_t trace_mr_send(int, const void *, size_t, int);
+ssize_t trace_mr_recvfrom(int s, void *, size_t, int,
+			  struct sockaddr *, socklen_t *);
+ssize_t trace_mr_read(int, void *, size_t);
+int trace_mr_connect(int s, struct sockaddr *, socklen_t);
+int trace_mr_socket(int, int, int);
+int trace_mr_bind(int, struct sockaddr *, socklen_t);
+int trace_mr_close(int);
+time_t trace_mr_time(time_t *);
+int trace_mr_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+unsigned int trace_mr_res_randomid(unsigned int);
+
 #define send		trace_mr_send
 #define recvfrom	trace_mr_recvfrom
 #define	read		trace_mr_read
-- 
2.39.5