From b5722838c203d4411c87752ace0b199b8e5182d3 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 27 Sep 1998 07:29:59 +0000 Subject: [PATCH] Treat __GNU__ line NeXT: undefine BSD and FSCALE. --- getloadavg.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/getloadavg.c b/getloadavg.c index 154f18d..7c1cc80 100644 --- a/getloadavg.c +++ b/getloadavg.c @@ -132,6 +132,12 @@ extern int errno; # undef FSCALE # endif +/* Same issues as for NeXT apply to the HURD-based GNU system. */ +# ifdef __GNU__ +# undef BSD +# undef FSCALE +# endif /* __GNU__ */ + /* Set values that are different from the defaults, which are set a little farther down with #ifndef. */ @@ -528,13 +534,13 @@ static long offset; #if !defined(VMS) && !defined(sgi) && !defined(__linux__) static struct nlist nl[2]; -#endif +#endif /* Not VMS or sgi */ #ifdef SUNOS_5 static kvm_t *kd; #endif /* SUNOS_5 */ -# endif /* LOAD_AVE_TYPE && !HAVE_LIBKSTAT */ +#endif /* LOAD_AVE_TYPE && !HAVE_LIBKSTAT */ /* Put the 1 minute, 5 minute and 15 minute load averages into the first NELEM elements of LOADAVG. -- 2.7.4