[src/netbsd-9]: src/sys/kern Additionally pull up the following revision for ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7370a936d044
branches:  netbsd-9
changeset: 843214:7370a936d044
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Sep 11 16:36:13 2019 +0000

description:
Additionally pull up the following revision for ticket #192, to fix the build:

        src/sys/kern/kern_time.c        1.199

mark a variable __diagused to fix this problem affecting many builds:

kern/kern_time.c:1413:6: error: variable 'error' set but not used
[-Werror=unused-but-set-variable]

diffstat:

 sys/kern/kern_time.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 6114941fcc2e -r 7370a936d044 sys/kern/kern_time.c
--- a/sys/kern/kern_time.c      Tue Sep 10 16:18:59 2019 +0000
+++ b/sys/kern/kern_time.c      Wed Sep 11 16:36:13 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_time.c,v 1.197.4.1 2019/09/10 16:16:46 martin Exp $       */
+/*     $NetBSD: kern_time.c,v 1.197.4.2 2019/09/11 16:36:13 martin Exp $       */
 
 /*-
  * Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.197.4.1 2019/09/10 16:16:46 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.197.4.2 2019/09/11 16:36:13 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/resourcevar.h>
@@ -1410,7 +1410,7 @@
 itimerdecr(struct ptimer *pt, int nsec)
 {
        struct itimerspec *itp;
-       int error;
+       int error __diagused;
 
        KASSERT(mutex_owned(&timer_lock));
        KASSERT(CLOCK_VIRTUAL_P(pt->pt_type));