lbalhar / rpms / bind

Forked from rpms/bind 6 years ago
Clone
Adam Tkac ad0a5e1
Written-by: Mark Andrews <Mark_Andrews isc org>
Adam Tkac ad0a5e1
Reviewed-by: Adam Tkac <atkac redhat com>
Adam Tkac ad0a5e1
Adam Tkac ad0a5e1
diff -up bind-9.5.0a6/lib/bind/resolv/res_data.c._res_errno bind-9.5.0a6/lib/bind/resolv/res_data.c
Adam Tkac ad0a5e1
--- bind-9.5.0a6/lib/bind/resolv/res_data.c._res_errno	2007-09-06 09:26:29.000000000 +0200
Adam Tkac ad0a5e1
+++ bind-9.5.0a6/lib/bind/resolv/res_data.c	2007-09-06 09:28:14.000000000 +0200
Adam Tkac ad0a5e1
@@ -40,7 +40,6 @@ static const char rcsid[] = "$Id: res_da
Adam Tkac ad0a5e1
 #include <unistd.h>
Adam Tkac ad0a5e1
 
Adam Tkac ad0a5e1
 #include "port_after.h"
Adam Tkac ad0a5e1
-#undef _res
Adam Tkac ad0a5e1
 
Adam Tkac ad0a5e1
 const char *_res_opcodes[] = {
Adam Tkac ad0a5e1
 	"QUERY",
Adam Tkac ad0a5e1
@@ -70,6 +69,7 @@ const char *_res_sectioncodes[] = {
Adam Tkac ad0a5e1
 };
Adam Tkac ad0a5e1
 #endif
Adam Tkac ad0a5e1
 
Adam Tkac ad0a5e1
+#undef _res
Adam Tkac ad0a5e1
 #ifndef __BIND_NOSTATIC
Adam Tkac ad0a5e1
 struct __res_state _res
Adam Tkac ad0a5e1
 # if defined(__BIND_RES_TEXT)
Adam Tkac ad0a5e1
@@ -77,6 +77,10 @@ struct __res_state _res
Adam Tkac ad0a5e1
 # endif
Adam Tkac ad0a5e1
         ;
Adam Tkac ad0a5e1
 
Adam Tkac ad0a5e1
+#if defined(DO_PTHREADS) || defined(__linux)
Adam Tkac ad0a5e1
+#define _res (*__res_state())
Adam Tkac ad0a5e1
+#endif
Adam Tkac ad0a5e1
+
Adam Tkac ad0a5e1
 /* Proto. */
Adam Tkac ad0a5e1
 
Adam Tkac ad0a5e1
 int  res_ourserver_p(const res_state, const struct sockaddr_in *);