diff options
| -rw-r--r-- | get_load.c | 17 | ||||
| -rw-r--r-- | get_rload.c | 2 | ||||
| -rw-r--r-- | xload.c | 2 | ||||
| -rw-r--r-- | xload.h | 2 | ||||
| -rw-r--r-- | xload.man | 2 |
5 files changed, 12 insertions, 13 deletions
@@ -1,5 +1,6 @@ +/* $XdotOrg: xc/programs/xload/get_load.c,v 1.1.4.5.2.1 2004/03/04 17:49:14 eich Exp $ */ /* $XConsortium: get_load.c /main/37 1996/03/09 09:38:04 kaleb $ */ -/* $XFree86: xc/programs/xload/get_load.c,v 1.19 2003/11/17 22:20:54 dawes Exp $ */ +/* $XFree86: xc/programs/xload/get_load.c,v 1.21tsi Exp $ */ /* Copyright (c) 1989 X Consortium @@ -109,7 +110,7 @@ void GetLoadPoint( w, closure, call_data ) /* SYSV386 version */ #ifndef macII #ifndef apollo #ifndef LOADSTUB -#if !defined(linux) && !defined(__UNIXOS2__) && !defined(__GNU__) +#if !defined(linux) && !defined(__UNIXOS2__) && !defined(__GLIBC__) #include <nlist.h> #endif /* !linux && ... */ #endif /* LOADSTUB */ @@ -209,9 +210,7 @@ struct lavnum { extern long lseek(); #endif -static void xload_error( -char *, char * -); +void xload_error(char *, char *); #ifdef apollo @@ -325,7 +324,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 */ @@ -351,7 +350,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 */ @@ -916,7 +915,7 @@ void InitLoadPoint() } #else /* sun svr4 5.5 or later */ -#if (!defined(SVR4)) && !defined(sgi) && !defined(MOTOROLA) && !(BSD >= 199103) +#if !defined(SVR4) && !defined(sgi) && !defined(MOTOROLA) && !defined(AIXV5) && !(BSD >= 199103) extern void nlist(); #endif @@ -1126,7 +1125,7 @@ void GetLoadPoint( w, closure, call_data ) #endif /* KVM_ROUTINES else */ #endif /* SYSV && i386 else */ -static void xload_error(str1, str2) +void xload_error(str1, str2) char *str1, *str2; { (void) fprintf(stderr,"xload: %s %s\n", str1, str2); diff --git a/get_rload.c b/get_rload.c index ad81454..9629d01 100644 --- a/get_rload.c +++ b/get_rload.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xload/get_rload.c,v 1.5 2002/01/07 21:46:49 dawes Exp $ */ +/* $XFree86: xc/programs/xload/get_rload.c,v 1.4 2002/01/07 20:38:31 dawes Exp $ */ #include <stdio.h> #include <X11/Intrinsic.h> @@ -1,5 +1,5 @@ /* $XConsortium: xload.c,v 1.37 94/04/17 20:43:44 converse Exp $ */ -/* $XFree86: xc/programs/xload/xload.c,v 1.7 2002/09/18 17:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/xload/xload.c,v 1.6tsi Exp $ */ /* Copyright (c) 1989 X Consortium @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xload/xload.h,v 1.2 2001/08/28 17:10:39 tsi Exp $ */ +/* $XFree86: xc/programs/xload/xload.h,v 1.1 2001/08/27 23:35:14 dawes Exp $ */ #ifndef _XLOAD_H_ #define _XLOAD_H_ @@ -1,6 +1,6 @@ .\" $XConsortium: xload.man,v 1.29 94/04/17 20:43:44 matt Exp $ .\" -.\" $XFree86: xc/programs/xload/xload.man,v 1.5 2002/10/12 16:06:48 herrb Exp $ +.\" $XFree86: xc/programs/xload/xload.man,v 1.4 2001/08/13 19:35:01 dawes Exp $ .\" .TH XLOAD 1 __xorgversion__ .SH NAME |