summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:12 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:12 +0000
commitd8ff970419a46b901ddf676a2ca8fd71bbca8e55 (patch)
tree74ce079665dff3801c6677a4d98717b78afd7b12
parent0f22ecbb798add2e02b586894434884765f7daae (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branch
-rw-r--r--get_load.c4
1 files changed, 1 insertions, 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
);