Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/compat/netbsd32 make the ?: expression types match



details:   https://anonhg.NetBSD.org/src/rev/3bc2c916252f
branches:  trunk
changeset: 1003678:3bc2c916252f
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Sep 26 01:30:00 2019 +0000

description:
make the ?: expression types match

diffstat:

 sys/compat/netbsd32/netbsd32_time.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 9a03eb4026f2 -r 3bc2c916252f sys/compat/netbsd32/netbsd32_time.c
--- a/sys/compat/netbsd32/netbsd32_time.c       Thu Sep 26 01:29:00 2019 +0000
+++ b/sys/compat/netbsd32/netbsd32_time.c       Thu Sep 26 01:30:00 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_time.c,v 1.51 2019/01/27 02:08:40 pgoyette Exp $      */
+/*     $NetBSD: netbsd32_time.c,v 1.52 2019/09/26 01:30:00 christos Exp $      */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.51 2019/01/27 02:08:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.52 2019/09/26 01:30:00 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ntp.h"
@@ -534,11 +534,11 @@
 
        switch (SCARG(uap, idtype)) {
        case P_PID:
-               pid = id == 0 ? l->l_proc->p_pid : id;
+               pid = id == 0 ? l->l_proc->p_pid : (pid_t)id;
                clock_id = CLOCK_PROCESS_CPUTIME_ID | pid;
                break;
        case P_LWPID:
-               lid = id == 0 ? l->l_lid : id;
+               lid = id == 0 ? l->l_lid : (lwpid_t)id;
                clock_id = CLOCK_THREAD_CPUTIME_ID | lid;
                break;
        default:



Home | Main Index | Thread Index | Old Index