Turn off DIAGNOSTIC so it builds.

This commit is contained in:
ad 2008-05-31 19:28:36 +00:00
parent a2180d724d
commit fdce452b03
2 changed files with 5 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.rump,v 1.7 2008/05/03 14:48:31 lukem Exp $ # $NetBSD: Makefile.rump,v 1.8 2008/05/31 19:28:36 ad Exp $
# #
.include <bsd.own.mk> .include <bsd.own.mk>
@ -14,7 +14,7 @@ CPPFLAGS+= -I${.CURDIR} -I.
.if "${RUMPKERNEL}" != "no" .if "${RUMPKERNEL}" != "no"
CFLAGS+= -ffreestanding CFLAGS+= -ffreestanding
CPPFLAGS:= -I${NETBSDSRCDIR}/sys/rump/include ${CPPFLAGS} CPPFLAGS:= -I${NETBSDSRCDIR}/sys/rump/include ${CPPFLAGS}
CPPFLAGS+= -D_KERNEL -DDIAGNOSTIC -I${NETBSDSRCDIR}/common/include CPPFLAGS+= -D_KERNEL -I${NETBSDSRCDIR}/common/include
CPPFLAGS+= -D_RUMPKERNEL -DDEBUG CPPFLAGS+= -D_RUMPKERNEL -DDEBUG
CPPFLAGS+= -nostdinc -I${NETBSDSRCDIR}/sys CPPFLAGS+= -nostdinc -I${NETBSDSRCDIR}/sys
.endif .endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: locks.c,v 1.15 2008/04/28 20:24:10 martin Exp $ */ /* $NetBSD: locks.c,v 1.16 2008/05/31 19:28:36 ad Exp $ */
/*- /*-
* Copyright (c) 2008 The NetBSD Foundation, Inc. * Copyright (c) 2008 The NetBSD Foundation, Inc.
@ -222,7 +222,9 @@ cv_wait_sig(kcondvar_t *cv, kmutex_t *mtx)
int int
cv_timedwait(kcondvar_t *cv, kmutex_t *mtx, int ticks) cv_timedwait(kcondvar_t *cv, kmutex_t *mtx, int ticks)
{ {
#ifdef DIAGNOSTIC
extern int hz; extern int hz;
#endif
if (ticks == 0) { if (ticks == 0) {
cv_wait(cv, mtx); cv_wait(cv, mtx);