From 410171110f40799d6af833eac262c3b5fb58116f Mon Sep 17 00:00:00 2001 From: christos Date: Tue, 26 Nov 2002 19:08:06 +0000 Subject: [PATCH] change fields of struct selinfo from si_ to sel_ so that the don't conflict with siginfo members. --- sys/sys/select.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/sys/select.h b/sys/sys/select.h index b32e9083d278..b002a006822b 100644 --- a/sys/sys/select.h +++ b/sys/sys/select.h @@ -1,4 +1,4 @@ -/* $NetBSD: select.h,v 1.13 2002/10/23 09:15:00 jdolecek Exp $ */ +/* $NetBSD: select.h,v 1.14 2002/11/26 19:08:06 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -46,9 +46,9 @@ * notified when I/O becomes possible. */ struct selinfo { - pid_t si_pid; /* process to be notified */ - struct klist si_klist; /* knotes attached to this selinfo */ - short si_flags; /* see below */ + pid_t sel_pid; /* process to be notified */ + struct klist sel_klist; /* knotes attached to this selinfo */ + short sel_flags; /* see below */ }; #define SI_COLL 0x0001 /* collision occurred */ @@ -62,9 +62,9 @@ static __inline void selnotify(struct selinfo *sip, long knhint) { - if (sip->si_pid != 0) + if (sip->sel_pid != 0) selwakeup(sip); - KNOTE(&sip->si_klist, knhint); + KNOTE(&sip->sel_klist, knhint); } #endif