summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1998-09-27 07:29:59 +0000
committerRichard M. Stallman <rms@gnu.org>1998-09-27 07:29:59 +0000
commit5b6c6d04709da5bcfc6c5d9aec95927dd454eb43 (patch)
tree5b3301d0200f0aafcc93990bdf2fe33a292db24a
parent86c2c453d27a4a913ef9d5919d96ff1a0fc750ae (diff)
downloademacs-5b6c6d04709da5bcfc6c5d9aec95927dd454eb43.tar.gz
Treat __GNU__ line NeXT: undefine BSD and FSCALE.
-rw-r--r--src/getloadavg.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/getloadavg.c b/src/getloadavg.c
index 154f18d7feb..7c1cc8005ed 100644
--- a/src/getloadavg.c
+++ b/src/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.