diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:32 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:32 +0000 |
| commit | f48929043ade12968180b886a92cf70e5e884825 (patch) | |
| tree | 3b53547dfee8c6a900511ff7f2110aebd17d5937 | |
| parent | b1a06eb4735b58cd86204666b33037a32900604e (diff) | |
merge XFree86 RC2 (4.3.99.902) from vendor branchXEVIE-BASE
| -rw-r--r-- | get_load.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,6 +1,6 @@ -/* $XdotOrg: xc/programs/xload/get_load.c,v 1.1.4.2 2003/12/06 13:24:29 kaleb Exp $ */ +/* $XdotOrg: xc/programs/xload/get_load.c,v 1.1.4.3 2003/12/15 16:00:01 kaleb Exp $ */ /* $XConsortium: get_load.c /main/37 1996/03/09 09:38:04 kaleb $ */ -/* $XFree86: xc/programs/xload/get_load.c,v 1.20 2003/11/22 04:11:38 dawes Exp $ */ +/* $XFree86: xc/programs/xload/get_load.c,v 1.21 2003/12/19 02:05:40 dawes Exp $ */ /* Copyright (c) 1989 X Consortium @@ -271,7 +271,7 @@ void InitLoadPoint() /* SYSV386 version */ xload_error("cannot allocat space for", PROC_NAME); first_buf = (XtPointer) namelist[2].n_value; - last_buf = first_buf + v.v_buf * sizeof(struct buf); + last_buf = (char *)first_buf + v.v_buf * sizeof(struct buf); } /* ARGSUSED */ @@ -297,7 +297,7 @@ XtPointer call_data; /* pointer to (double) return value */ (p[i].p_stat == SIDL) || (p[i].p_stat == SXBRK) || (p[i].p_stat == SSLEEP && (p[i].p_pri < PZERO) && - (p[i].p_wchan >= first_buf) && (p[i].p_wchan < last_buf))) + (p[i].p_wchan >= (char *)first_buf) && (p[i].p_wchan < (char *)last_buf))) nproc++; /* update the load average using a decay filter */ |