svn commit: samba r10022 - in branches/SAMBA_4_0/source/heimdal/lib/roken: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-09-04 08:17:24 +0000 (Sun, 04 Sep 2005)
New Revision: 10022

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10022

Log:
Merge tpot's fix for IRIX and AIX_rea build problems from lorikeet-heimdal
to Samba4.

Andrew Bartlett


Modified:
   branches/SAMBA_4_0/source/heimdal/lib/roken/resolve.c


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal/lib/roken/resolve.c
===================================================================
--- branches/SAMBA_4_0/source/heimdal/lib/roken/resolve.c	2005-09-04 06:19:57 UTC (rev 10021)
+++ branches/SAMBA_4_0/source/heimdal/lib/roken/resolve.c	2005-09-04 08:17:24 UTC (rev 10022)
@@ -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",