diff options
| author | davidxu <davidxu@FreeBSD.org> | 2005-10-19 09:33:15 +0000 |
|---|---|---|
| committer | davidxu <davidxu@FreeBSD.org> | 2005-10-19 09:33:15 +0000 |
| commit | 22847b1b84ee37198dce444c364efdc4017f93f2 (patch) | |
| tree | 036cdfcf1ba68aa55faeb2e597c99ecd31f4399e /sys/compat/svr4/svr4_misc.c | |
| parent | 899db1aa120cba0596ce1edee9f8c6e0caeb9357 (diff) | |
| download | FreeBSD-src-22847b1b84ee37198dce444c364efdc4017f93f2.zip FreeBSD-src-22847b1b84ee37198dce444c364efdc4017f93f2.tar.gz | |
Fix compiling problem by adding prefix name svr4 to si_xxx macro, the
si_xxx macro should not be used in compat headers, as these are standard
member names or only can be used in our native header file signal.h.
Diffstat (limited to 'sys/compat/svr4/svr4_misc.c')
| -rw-r--r-- | sys/compat/svr4/svr4_misc.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index d7a9069..7fae260 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -1139,43 +1139,44 @@ svr4_setinfo(p, st, s) memset(&i, 0, sizeof(i)); - i.si_signo = SVR4_SIGCHLD; - i.si_errno = 0; /* XXX? */ + i.svr4_si_signo = SVR4_SIGCHLD; + i.svr4_si_errno = 0; /* XXX? */ if (p) { - i.si_pid = p->p_pid; + i.svr4_si_pid = p->p_pid; PROC_LOCK(p); calcru(p, &utime, &stime); PROC_UNLOCK(p); - i.si_stime = stime.tv_sec; - i.si_utime = utime.tv_sec; + i.svr4_si_stime = stime.tv_sec; + i.svr4_si_utime = utime.tv_sec; } if (WIFEXITED(st)) { - i.si_status = WEXITSTATUS(st); - i.si_code = SVR4_CLD_EXITED; + i.svr4_si_status = WEXITSTATUS(st); + i.svr4_si_code = SVR4_CLD_EXITED; } else if (WIFSTOPPED(st)) { sig = WSTOPSIG(st); if (sig >= 0 && sig < NSIG) - i.si_status = SVR4_BSD2SVR4_SIG(sig); + i.svr4_si_status = SVR4_BSD2SVR4_SIG(sig); - if (i.si_status == SVR4_SIGCONT) - i.si_code = SVR4_CLD_CONTINUED; + if (i.svr4_si_status == SVR4_SIGCONT) + i.svr4_si_code = SVR4_CLD_CONTINUED; else - i.si_code = SVR4_CLD_STOPPED; + i.svr4_si_code = SVR4_CLD_STOPPED; } else { sig = WTERMSIG(st); if (sig >= 0 && sig < NSIG) - i.si_status = SVR4_BSD2SVR4_SIG(sig); + i.svr4_si_status = SVR4_BSD2SVR4_SIG(sig); if (WCOREDUMP(st)) - i.si_code = SVR4_CLD_DUMPED; + i.svr4_si_code = SVR4_CLD_DUMPED; else - i.si_code = SVR4_CLD_KILLED; + i.svr4_si_code = SVR4_CLD_KILLED; } DPRINTF(("siginfo [pid %ld signo %d code %d errno %d status %d]\n", - i.si_pid, i.si_signo, i.si_code, i.si_errno, i.si_status)); + i.svr4_si_pid, i.svr4_si_signo, i.svr4_si_code, i.svr4_si_errno, + i.svr4_si_status)); return copyout(&i, s, sizeof(i)); } |
