[Xorg-commit] xc/programs/xload get_load.c,1.1.4.4,1.1.4.5

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/xload
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/xload

Modified Files:
      Tag: XORG-CURRENT
	get_load.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: get_load.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xload/get_load.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/get_load.c	20 Dec 2003 00:28:32 -0000	1.1.4.4
+++ b/get_load.c	23 Feb 2004 21:38:02 -0000	1.1.4.5
@@ -1,6 +1,6 @@
 /* $XdotOrg$ */
 /* $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 @@
 extern long lseek();
 #endif
 
-static void xload_error(
-char *, char *
-);
+void xload_error(char *, char *);
 
 
 #ifdef apollo
@@ -1072,7 +1070,7 @@
 #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);