svn commit: lorikeet r452 - in trunk/heimdal/lib/roken: .
abartlet at samba.org
abartlet at samba.org
Sun Sep 4 06:31:44 GMT 2005
Author: abartlet
Date: 2005-09-04 06:31:43 +0000 (Sun, 04 Sep 2005)
New Revision: 452
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=452
Log:
Fix from tpot to check for _res being declared as well as defined.
This (when merged) should fix the Samba4 build on AIX and IRIX.
Andrew Bartlett
Modified:
trunk/heimdal/lib/roken/resolve.c
Changeset:
Modified: trunk/heimdal/lib/roken/resolve.c
===================================================================
--- trunk/heimdal/lib/roken/resolve.c 2005-09-03 04:56:33 UTC (rev 451)
+++ trunk/heimdal/lib/roken/resolve.c 2005-09-04 06:31:43 UTC (rev 452)
@@ -490,7 +490,7 @@
memset(&state, 0, sizeof(state));
if(res_ninit(&state))
return NULL; /* is this the best we can do? */
-#elif defined(HAVE__RES)
+#elif defined(HAVE__RES) && defined(HAVE_DECL__RES)
u_long old_options = 0;
#endif
@@ -506,7 +506,7 @@
if (_resolve_debug) {
#ifdef HAVE_RES_NSEARCH
state.options |= RES_DEBUG;
-#elif defined(HAVE__RES)
+#elif defined(HAVE__RES) && defined(HAVE_DECL__RES)
old_options = _res.options;
_res.options |= RES_DEBUG;
#endif
@@ -526,7 +526,7 @@
len = res_search(domain, rr_class, rr_type, reply, size);
#endif
if (_resolve_debug) {
-#if defined(HAVE__RES) && !defined(HAVE_RES_NSEARCH)
+#if defined(HAVE__RES) && defined(HAVE_DECL__RES) && !defined(HAVE_RES_NSEARCH)
_res.options = old_options;
#endif
fprintf(stderr, "dns_lookup(%s, %d, %s) --> %d\n",
More information about the samba-cvs
mailing list