2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 09c459200..9dad80a70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20060630
  - (dtucker) [openbsd-compat/openbsd-compat.h] SNPRINTF_CONST for snprintf
    declaration too.  Patch from russ at sludge.net.
+ - (dtucker) [openbsd-compat/getrrsetbyname.c] Undef _res before defining it,
+   prevents warnings on platforms where _res is in the system headers.
 
 20060627
  - (dtucker) [configure.ac] Bug #1203: Add missing '[', which causes problems
@@ -4716,4 +4718,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.4351 2006/06/30 00:51:32 dtucker Exp $
+$Id: ChangeLog,v 1.4352 2006/06/30 01:47:49 dtucker Exp $
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 8dc744703..a855ad6d5 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -62,6 +62,9 @@ extern int h_errno;
 #define _THREAD_PRIVATE(a,b,c) (c)
 
 /* to avoid conflicts where a platform already has _res */
+#ifdef _res
+# undef _res
+#endif
 #define _res    _compat_res
 
 struct __res_state _res;