From bcb72d998e28a7f13aa5e738c6b2b251643b00bd Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Sat, 6 Dec 2003 13:24:29 +0000 Subject: merge XFree86 4.3.99.901 (RC1) from vendor branch --- get_load.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/get_load.c b/get_load.c index d7bf9ca..30b5844 100644 --- a/get_load.c +++ b/get_load.c @@ -1,5 +1,6 @@ +/* $XdotOrg: get_load.c /main/37 1996/03/09 09:38:04 kaleb $ */ /* $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.20 2003/11/22 04:11:38 dawes Exp $ */ /* Copyright (c) 1989 X Consortium @@ -54,7 +55,7 @@ from the X Consortium. #ifndef macII #ifndef apollo #ifndef LOADSTUB -#if !defined(linux) && !defined(__UNIXOS2__) && !defined(__GNU__) +#if !defined(linux) && !defined(__UNIXOS2__) && !defined(__GLIBC__) #include #endif /* !linux && ... */ #endif /* LOADSTUB */ -- cgit v1.2.3