diff options
| author | Dan Nicolaescu | 2009-01-02 18:35:15 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2009-01-02 18:35:15 +0000 |
| commit | bfe11752df54ac0a7dc03340c74c725a863505f5 (patch) | |
| tree | acbe736a62e8a18689436eef4c844fe84492ccd6 /src | |
| parent | 44d15ae01dfbae7b6e79493cfdf973cac98b0c48 (diff) | |
| download | emacs-bfe11752df54ac0a7dc03340c74c725a863505f5.tar.gz emacs-bfe11752df54ac0a7dc03340c74c725a863505f5.zip | |
(system_process_attributes): Provide Qtime and Qctime
for Solaris instead of incorrectly providing Qutime and Qcutime.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/sysdep.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dcbf8f8bd9e..9e8ec82e6c1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-01-02 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * sysdep.c (system_process_attributes): Provide Qtime and Qctime | ||
| 4 | for Solaris instead of incorrectly providing Qutime and Qcutime. | ||
| 5 | |||
| 1 | 2009-01-02 Eli Zaretskii <eliz@gnu.org> | 6 | 2009-01-02 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * w32.c (process_times): Compute sum of utime and stime. | 8 | * w32.c (process_times): Compute sum of utime and stime. |
diff --git a/src/sysdep.c b/src/sysdep.c index 1cf9890ecb8..fe3a55bdda6 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -3708,17 +3708,19 @@ system_process_attributes (Lisp_Object pid) | |||
| 3708 | Qcminflt | 3708 | Qcminflt |
| 3709 | Qcmajflt | 3709 | Qcmajflt |
| 3710 | 3710 | ||
| 3711 | Qutime | ||
| 3712 | Qcutime | ||
| 3711 | Qstime | 3713 | Qstime |
| 3712 | Qcstime | 3714 | Qcstime |
| 3713 | Are they available? */ | 3715 | Are they available? */ |
| 3714 | 3716 | ||
| 3715 | attrs = Fcons (Fcons (Qutime, | 3717 | attrs = Fcons (Fcons (Qtime, |
| 3716 | list3 (make_number (pinfo.pr_time.tv_sec >> 16), | 3718 | list3 (make_number (pinfo.pr_time.tv_sec >> 16), |
| 3717 | make_number (pinfo.pr_time.tv_sec & 0xffff), | 3719 | make_number (pinfo.pr_time.tv_sec & 0xffff), |
| 3718 | make_number (pinfo.pr_time.tv_nsec))), | 3720 | make_number (pinfo.pr_time.tv_nsec))), |
| 3719 | attrs); | 3721 | attrs); |
| 3720 | 3722 | ||
| 3721 | attrs = Fcons (Fcons (Qcutime, | 3723 | attrs = Fcons (Fcons (Qctime, |
| 3722 | list3 (make_number (pinfo.pr_ctime.tv_sec >> 16), | 3724 | list3 (make_number (pinfo.pr_ctime.tv_sec >> 16), |
| 3723 | make_number (pinfo.pr_ctime.tv_sec & 0xffff), | 3725 | make_number (pinfo.pr_ctime.tv_sec & 0xffff), |
| 3724 | make_number (pinfo.pr_ctime.tv_nsec))), | 3726 | make_number (pinfo.pr_ctime.tv_nsec))), |