Virgin import of BIND v8.2.3-T6B

3 files changed, 10 insertions, 8 deletions

diff --git a/contrib/bind/lib/isc/Makefile b/contrib/bind/lib/isc/Makefile
index 364c442..5485ec7 100644
--- a/contrib/bind/lib/isc/Makefile
+++ b/contrib/bind/lib/isc/Makefile
@@ -13,7 +13,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# $Id: Makefile,v 8.25 2000/02/29 03:38:23 vixie Exp $
+# $Id: Makefile,v 8.26 2000/07/11 06:41:41 vixie Exp $
 
 # these are only appropriate for BSD 4.4 or derivatives, and are used in
 # development.  normal builds will be done in the top level directory and
@@ -32,7 +32,8 @@ INCL = ${TOP}/include
 PORTINCL = ${TOP}/port/${SYSTYPE}/include
 LIBBIND = ${TOP}/lib/libbind.${A}
 LIBBINDR = ../${TOP}/lib/libbind_r.${A}
-CFLAGS=	${CDEBUG} -I${PORTINCL} -I${INCL}
+CFLAGS=	${CDEBUG}
+CPPFLAGS= -I${PORTINCL} -I${INCL}
 # -Wimplicit
 LD_LIBFLAGS= -x -r
 AR= ar cru
diff --git a/contrib/bind/lib/isc/ev_timers.c b/contrib/bind/lib/isc/ev_timers.c
index 0db770c..ff44e49 100644
--- a/contrib/bind/lib/isc/ev_timers.c
+++ b/contrib/bind/lib/isc/ev_timers.c
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_timers.c,v 1.25 1999/10/07 20:44:04 vixie Exp $";
+static const char rcsid[] = "$Id: ev_timers.c,v 1.26 2000/07/17 07:36:54 vixie Exp $";
 #endif
 
 /* Import. */
@@ -30,6 +30,7 @@ static const char rcsid[] = "$Id: ev_timers.c,v 1.25 1999/10/07 20:44:04 vixie E
 
 #include <errno.h>
 
+#include <isc/assertions.h>
 #include <isc/eventlib.h>
 #include "eventlib_p.h"
 
@@ -110,6 +111,7 @@ evNowTime() {
 
 	if (gettimeofday(&now, NULL) < 0)
 		return (evConsTime(0, 0));
+	INSIST(now.tv_usec >= 0 && now.tv_usec < 1000000);
 	return (evTimeSpec(now));
 }
 
diff --git a/contrib/bind/lib/isc/ev_waits.c b/contrib/bind/lib/isc/ev_waits.c
index e7bfbf7..9608424 100644
--- a/contrib/bind/lib/isc/ev_waits.c
+++ b/contrib/bind/lib/isc/ev_waits.c
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_waits.c,v 8.10 2000/02/04 07:25:50 vixie Exp $";
+static const char rcsid[] = "$Id: ev_waits.c,v 8.11 2000/07/20 18:17:52 vixie Exp $";
 #endif
 
 #include "port_before.h"
@@ -49,7 +49,7 @@ static evWaitList *	evGetWaitList(evContext_p *, const void *, int);
  */
 int
 evWaitFor(evContext opaqueCtx, const void *tag,
-       evWaitFunc func, void *uap, evWaitID *id)
+	  evWaitFunc func, void *uap, evWaitID *id)
 {
 	evContext_p *ctx = opaqueCtx.opaque;
 	evWait *new;
@@ -60,11 +60,10 @@ evWaitFor(evContext opaqueCtx, const void *tag,
 	new->uap = uap;
 	new->tag = tag;
 	new->next = NULL;
-	if (wl->last != NULL) {
+	if (wl->last != NULL)
 		wl->last->next = new;
-	} else {
+	else
 		wl->first = new;
-	}
 	wl->last = new;
 	if (id != NULL)
 		id->opaque = new;