From 102f4b1740f3225c4410c69e0e57ac3a35d8c245 Mon Sep 17 00:00:00 2001 From: "Paul D. Smith" Date: Thu, 30 Jul 1998 20:55:47 +0000 Subject: [PATCH] GNU make release 3.77. --- src/getloadavg.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/getloadavg.c b/src/getloadavg.c index adc4befeb94..154f18d7feb 100644 --- a/src/getloadavg.c +++ b/src/getloadavg.c @@ -35,6 +35,7 @@ LOAD_AVE_TYPE Type of the load average array in the kernel. Must be defined unless one of apollo, DGUX, NeXT, or UMAX is defined; + or we have libkstat; otherwise, no load average is available. NLIST_STRUCT Include nlist.h, not a.out.h, and the nlist n_name element is a pointer, @@ -500,6 +501,7 @@ extern int errno; # include # endif + /* Avoid static vars inside a function since in HPUX they dump as pure. */ # ifdef NeXT @@ -516,7 +518,7 @@ static unsigned int samples; static struct dg_sys_info_load_info load_info; /* what-a-mouthful! */ # endif /* DGUX */ -# ifdef LOAD_AVE_TYPE +#if !defined(HAVE_LIBKSTAT) && defined(LOAD_AVE_TYPE) /* File descriptor open to /dev/kmem or VMS load ave driver. */ static int channel; /* Nonzero iff channel is valid. */ @@ -524,15 +526,15 @@ static int getloadavg_initialized; /* Offset in kmem to seek to read load average, or 0 means invalid. */ static long offset; -# if !defined(VMS) && !defined(sgi) && !defined(__linux__) +#if !defined(VMS) && !defined(sgi) && !defined(__linux__) static struct nlist nl[2]; -# endif /* Not VMS or sgi */ +#endif -# ifdef SUNOS_5 +#ifdef SUNOS_5 static kvm_t *kd; -# endif /* SUNOS_5 */ +#endif /* SUNOS_5 */ -# endif /* LOAD_AVE_TYPE */ +# 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.39.2