diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:33:12 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:33:12 +0000 |
| commit | d7f9bb4fb8ed593f26d2d9ed2fa3b2383e3751f0 (patch) | |
| tree | c07258054dc871efac209d1b99ab7d76372312f5 /get_load.c | |
| parent | dbb0e949c323a22778c6e21c75787b386ea362ee (diff) | |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGECYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-MERGE
Diffstat (limited to 'get_load.c')
| -rw-r--r-- | get_load.c | 17 |
1 files changed, 8 insertions, 9 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); |