From d8ff970419a46b901ddf676a2ca8fd71bbca8e55 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Wed, 26 Nov 2003 22:49:12 +0000 Subject: merge latest (4.3.99.16) from XFree86 (vendor) branch --- get_load.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/get_load.c b/get_load.c index 09386dc..d7bf9ca 100644 --- a/get_load.c +++ b/get_load.c @@ -1,5 +1,5 @@ /* $XConsortium: get_load.c /main/37 1996/03/09 09:38:04 kaleb $ */ -/* $XFree86: xc/programs/xload/get_load.c,v 1.18 2002/09/18 17:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/xload/get_load.c,v 1.19 2003/11/17 22:20:54 dawes Exp $ */ /* Copyright (c) 1989 X Consortium @@ -155,9 +155,7 @@ extern long lseek(); #endif static void xload_error( -#if NeedFunctionPrototypes char *, char * -#endif ); -- cgit v1.2.3