diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-01 15:07:02 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-01 15:07:02 +0000 |
| commit | d98e380e38807687b9bcc96d976662f7621469ad (patch) | |
| tree | d015ddae4684fa4ef1342ac001926702259de513 | |
| parent | f48929043ade12968180b886a92cf70e5e884825 (diff) | |
3. Added missing parts to XKB to make XEVIE branch compile (Egbert Eich).XEVIE
2. Merged with XORG-CURRENT branch to obtain a bugfix (Egbert Eich).
1. First add of SUN's XIVIE extension (Stuart Kreitman).
| -rw-r--r-- | get_load.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -1,6 +1,6 @@ -/* $XdotOrg: xc/programs/xload/get_load.c,v 1.1.4.3 2003/12/15 16:00:01 kaleb Exp $ */ +/* $XdotOrg: xc/programs/xload/get_load.c,v 1.1.4.5 2004/02/23 21:38:02 kaleb Exp $ */ /* $XConsortium: get_load.c /main/37 1996/03/09 09:38:04 kaleb $ */ -/* $XFree86: xc/programs/xload/get_load.c,v 1.21 2003/12/19 02:05:40 dawes Exp $ */ +/* $XFree86: xc/programs/xload/get_load.c,v 1.22 2003/12/22 17:48:13 tsi Exp $ */ /* Copyright (c) 1989 X Consortium @@ -155,9 +155,7 @@ struct lavnum { extern long lseek(); #endif -static void xload_error( -char *, char * -); +void xload_error(char *, char *); #ifdef apollo @@ -1072,7 +1070,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); |