diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-09-04 08:17:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:36:30 -0500 |
| commit | 52d9dbe75c088922052a7e54213963ed90f1c021 (patch) | |
| tree | f2ed5bbb7357b2edb296619a61985310b09e17b2 /source4 | |
| parent | 370f5b9563ff993229bde1cababf3e2a52c60661 (diff) | |
| download | samba-52d9dbe75c088922052a7e54213963ed90f1c021.tar.gz samba-52d9dbe75c088922052a7e54213963ed90f1c021.tar.bz2 samba-52d9dbe75c088922052a7e54213963ed90f1c021.zip | |
r10022: Merge tpot's fix for IRIX and AIX_rea build problems from lorikeet-heimdal
to Samba4.
Andrew Bartlett
(This used to be commit 6835e427907bf52f7fdd332b726ffa47041853de)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/heimdal/lib/roken/resolve.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/heimdal/lib/roken/resolve.c b/source4/heimdal/lib/roken/resolve.c index d035982077..8764f422ec 100644 --- a/source4/heimdal/lib/roken/resolve.c +++ b/source4/heimdal/lib/roken/resolve.c @@ -490,7 +490,7 @@ dns_lookup_int(const char *domain, int rr_class, int rr_type) 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 @@ dns_lookup_int(const char *domain, int rr_class, int rr_type) 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 @@ dns_lookup_int(const char *domain, int rr_class, int rr_type) 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", |