diff options
| author | David Xu <davidxu@FreeBSD.org> | 2005-11-04 09:41:00 +0000 |
|---|---|---|
| committer | David Xu <davidxu@FreeBSD.org> | 2005-11-04 09:41:00 +0000 |
| commit | 8f0371f19d85ab269c94258d30b87aef416d529d (patch) | |
| tree | 71fac15496379ce07a2aa8da1c428250c9de46a5 /sys | |
| parent | 6383e2266c40617a52cc08fe71671d5c9bbc720a (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_sig.c | 2 | ||||
| -rw-r--r-- | sys/kern/kern_time.c | 2 | ||||
| -rw-r--r-- | sys/kern/vfs_aio.c | 4 | ||||
| -rw-r--r-- | sys/sys/signal.h | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index bfa9ff34d9df..e422df45a8a9 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1785,7 +1785,7 @@ sigqueue(struct thread *td, struct sigqueue_args *uap) ksi.ksi_code = SI_QUEUE; ksi.ksi_pid = td->td_proc->p_pid; ksi.ksi_uid = td->td_ucred->cr_ruid; - ksi.ksi_value.sigval_ptr = uap->value; + ksi.ksi_value.sival_ptr = uap->value; error = tdsignal(p, NULL, ksi.ksi_signo, &ksi); } PROC_UNLOCK(p); diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index b796529a6c60..ac838beb1e59 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -1028,7 +1028,7 @@ kern_timer_create(struct thread *td, clockid_t clock_id, it->it_sigev.sigev_signo = SIGPROF; break; } - it->it_sigev.sigev_value.sigval_int = id; + it->it_sigev.sigev_value.sival_int = id; } if (it->it_sigev.sigev_notify == SIGEV_SIGNAL || diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 534b87d079cd..e9262177207d 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -1481,7 +1481,7 @@ _aio_aqueue(struct thread *td, struct aiocb *job, struct aio_liojob *lj, if (aiocbe->uaiocb.aio_sigevent.sigev_notify == SIGEV_KEVENT) { kev.ident = aiocbe->uaiocb.aio_sigevent.sigev_notify_kqueue; - kev.udata = aiocbe->uaiocb.aio_sigevent.sigev_value.sigval_ptr; + kev.udata = aiocbe->uaiocb.aio_sigevent.sigev_value.sival_ptr; } else goto no_kqueue; if ((u_int)kev.ident >= fdp->fd_nfiles || @@ -2117,7 +2117,7 @@ do_lio_listio(struct thread *td, struct lio_listio_args *uap, int oldsigev) if (lj->lioj_signal.sigev_notify == SIGEV_KEVENT) { /* Assume only new style KEVENT */ kev.ident = lj->lioj_signal.sigev_notify_kqueue; - kev.udata = lj->lioj_signal.sigev_value.sigval_ptr; + kev.udata = lj->lioj_signal.sigev_value.sival_ptr; if ((u_int)kev.ident >= p->p_fd->fd_nfiles || (kq_fp = p->p_fd->fd_ofiles[kev.ident]) == NULL || diff --git a/sys/sys/signal.h b/sys/sys/signal.h index 55da8b45a14d..8e4daa64f5dc 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -150,8 +150,8 @@ typedef __sigset_t sigset_t; #if __POSIX_VISIBLE >= 199309 || __XSI_VISIBLE >= 500 union sigval { /* Members as suggested by Annex C of POSIX 1003.1b. */ - int sigval_int; - void *sigval_ptr; + int sival_int; + void *sival_ptr; }; #endif @@ -163,7 +163,7 @@ struct sigevent { union { __lwpid_t _threadid; struct { - void (*_function)(union sigval *); + void (*_function)(union sigval); void *_attribute; /* pthread_attr_t * */ } _sigev_thread; } _sigev_un; |