diff options
| author | davidxu <davidxu@FreeBSD.org> | 2005-11-04 09:41:00 +0000 |
|---|---|---|
| committer | davidxu <davidxu@FreeBSD.org> | 2005-11-04 09:41:00 +0000 |
| commit | ae161ac2394e00bb3afca0667a13243d7963dfe2 (patch) | |
| tree | 71fac15496379ce07a2aa8da1c428250c9de46a5 /sys/kern | |
| parent | 40db0365d4b9fcce49ec895c834e40001ae50dc0 (diff) | |
| download | FreeBSD-src-ae161ac2394e00bb3afca0667a13243d7963dfe2.zip FreeBSD-src-ae161ac2394e00bb3afca0667a13243d7963dfe2.tar.gz | |
Fix name compatible problem with POSIX standard. the sigval_ptr and
sigval_int really should be sival_ptr and sival_int.
Also sigev_notify_function accepts a union sigval value but not a
pointer.
Diffstat (limited to 'sys/kern')
| -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 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index bfa9ff3..e422df4 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 b796529..ac838be 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 534b87d..e926217 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 || |
