- (dtucker) [openbsd-compat/getrrsetbyname.c] Use _compat_res instead of

   _res, prevents problems on some platforms that have _res as a global but
   don't have getrrsetbyname(), eg IRIX 5.3.  Found and tested by
   georg.schwarz at freenet.de, ok djm@.

diff --git a/ChangeLog b/ChangeLog
index 310727b5b76cf234fefe767a45757412a34f91ec..e405fb59b81a7547988c437fbb249a83176eaa50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20050515
+ - (dtucker) [openbsd-compat/getrrsetbyname.c] Use _compat_res instead of
+   _res, prevents problems on some platforms that have _res as a global but
+   don't have getrrsetbyname(), eg IRIX 5.3.  Found and tested by
+   georg.schwarz at freenet.de, ok djm@.
+
 20050506
  - (dtucker) OpenBSD CVS Syn
    - dtucker@cvs.openbsd.org 2006/04/25 08:02:27

diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index bea6aea3b5bd90524b490299d2da98b62d1885fe..8dc744703279f759cabe217b159280f9ae15066b 100644 (file)
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -60,6 +60,10 @@ extern int h_errno;
 # undef _THREAD_PRIVATE
 #endif
 #define _THREAD_PRIVATE(a,b,c) (c)
+
+/* to avoid conflicts where a platform already has _res */
+#define _res   _compat_res
+
 struct __res_state _res;
 
 /* Necessary functions and macros */