Fix minor compilation issues.

This commit is contained in:
christos 2007-01-27 23:02:12 +00:00
parent 87352b7746
commit 91eccc4aa8
2 changed files with 5 additions and 7 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: res_init.c,v 1.9 2007/01/27 22:26:44 christos Exp $ */
/* $NetBSD: res_init.c,v 1.10 2007/01/27 23:02:12 christos Exp $ */
/*
* Copyright (c) 1985, 1989, 1993
@ -76,7 +76,7 @@
static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93";
static const char rcsid[] = "Id: res_init.c,v 1.16.18.5 2006/08/30 23:23:13 marka Exp";
#else
__RCSID("$NetBSD: res_init.c,v 1.9 2007/01/27 22:26:44 christos Exp $");
__RCSID("$NetBSD: res_init.c,v 1.10 2007/01/27 23:02:12 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -121,7 +121,6 @@ __weak_alias(res_setservers,__res_setservers)
#include "res_private.h"
/*% Options. Should all be left alone. */
#define RESOLVSORT
#ifndef DEBUG
#define DEBUG
#endif
@ -238,7 +237,6 @@ __res_vinit(res_state statp, int preinit) {
strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int");
} else
return (-1);
#ifdef RESOLVSORT
statp->nsort = 0;
res_setservers(statp, u, nserv);

View File

@ -1,4 +1,4 @@
/* $NetBSD: res_send.c,v 1.10 2007/01/27 22:26:44 christos Exp $ */
/* $NetBSD: res_send.c,v 1.11 2007/01/27 23:02:12 christos Exp $ */
/*
* Copyright (c) 1985, 1989, 1993
@ -76,7 +76,7 @@
static const char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "Id: res_send.c,v 1.9.18.8 2006/10/16 23:00:58 marka Exp";
#else
__RCSID("$NetBSD: res_send.c,v 1.10 2007/01/27 22:26:44 christos Exp $");
__RCSID("$NetBSD: res_send.c,v 1.11 2007/01/27 23:02:12 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -898,7 +898,7 @@ send_dg(res_state statp, const u_char *buf, int buflen, u_char *ans,
#else
timeout = evSubTime(finish, now);
if (timeout.tv_sec < 0)
timeout = evConsTime(0, 0);
timeout = evConsTime(0L, 0L);
polltimeout = 1000*timeout.tv_sec +
timeout.tv_nsec/1000000;
pollfd.fd = s;