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
commitb5722838c203d4411c87752ace0b199b8e5182d3 (patch)
tree96508cc7da128b94f19090557dc81ec0968a885e
parent7a43e6cd3088a1edba0603b3dad276a9aef709ff (diff)
downloadgunmake-b5722838c203d4411c87752ace0b199b8e5182d3.tar.gz
Treat __GNU__ line NeXT: undefine BSD and FSCALE.
-rw-r--r--getloadavg.c10
1 files 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.