Avoid name clash with standard si_{uid,pid} fields.

This commit is contained in:
erh 1999-01-03 04:53:59 +00:00
parent 5422cb89d9
commit f1a0e1b396
2 changed files with 6 additions and 6 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_machdep.c,v 1.3 1998/12/08 21:00:11 erh Exp $ */
/* $NetBSD: linux_machdep.c,v 1.4 1999/01/03 04:53:59 erh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -174,8 +174,8 @@ void setup_linux_rt_sigframe(tf, sig, mask)
bzero(&sigframe.info, sizeof(struct linux_siginfo));
sigframe.info.si_signo = sig;
sigframe.info.si_code = LINUX_SI_USER;
sigframe.info.si_pid = p->p_pid;
sigframe.info.si_uid = p->p_ucred->cr_uid; /* Use real uid here? */
sigframe.info.lsi_pid = p->p_pid;
sigframe.info.lsi_uid = p->p_ucred->cr_uid; /* Use real uid here? */
if (copyout((caddr_t)&sigframe, (caddr_t)sfp, fsize) != 0) {
#ifdef DEBUG

View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_siginfo.h,v 1.1 1998/09/30 21:36:27 erh Exp $ */
/* $NetBSD: linux_siginfo.h,v 1.2 1999/01/03 04:53:59 erh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -94,8 +94,8 @@ typedef struct linux_siginfo {
} _sidata;
} linux_siginfo_t;
#define si_pid _sidata._kill._pid
#define si_uid _sidata._kill._uid
#define lsi_pid _sidata._kill._pid
#define lsi_uid _sidata._kill._uid
#define LINUX_SI_USER 0
#define LINUX_SI_KERNEL 0x80