(display_text_line): Move the code to fill out the line

[gnu-emacs] / src / getloadavg.c

diff --git a/src/getloadavg.c b/src/getloadavg.c
index 635e5ac534af828b5281f1044594f24b1e30deda..dba7907bd7787849312078981969542a222df681 100644 (file)
--- a/src/getloadavg.c
+++ b/src/getloadavg.c
@@ -1,5 +1,5 @@
 /* Get the system load averages.
-   Copyright (C) 1985, 86, 87, 88, 89, 91, 92, 93, 1994, 1995
+   Copyright (C) 1985, 86, 87, 88, 89, 91, 92, 93, 1994, 1995, 1997
        Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -43,7 +43,7 @@
    DGUX
    eunice                      UNIX emulator under VMS.
    hpux
-   MSDOS                       No-op for MSDOS.
+   __MSDOS__                   No-op for MSDOS.
    NeXT
    sgi
    sequent                     Sequent Dynix 3.x.x (BSD)
@@ -52,7 +52,7 @@
    UMAX
    UMAX4_3
    VMS
-   WIN32                       No-op for Windows95/NT.
+   WINDOWS32                   No-op for Windows95/NT.
    __linux__                   Linux: assumes /proc filesystem mounted.
                                Support from Michael K. Johnson.
    __NetBSD__                  NetBSD: assumes /kern filesystem mounted.
@@ -436,6 +436,12 @@ extern int errno;
 
 # endif /* LOAD_AVE_TYPE */
 
+# ifdef __GNU__
+/* GNU hurd systems act sort of like NeXT ones, for load average purposes.  */
+#  define NeXT
+#  define host_self mach_host_self
+# endif
+
 # ifdef NeXT
 #  ifdef HAVE_MACH_MACH_H
 #   include <mach/mach.h>
@@ -535,7 +541,7 @@ getloadavg (loadavg, nelem)
   elem = -1;
 # endif
 
-# if !defined (LDAV_DONE) && defined (SUNOS_5)
+# if !defined (LDAV_DONE) && defined (HAVE_LIBKSTAT)
 /* Use libkstat because we don't have to be root.  */
 #  define LDAV_DONE
   kstat_ctl_t *kc;
@@ -580,7 +586,7 @@ getloadavg (loadavg, nelem)
     }
 
   kstat_close (kc);
-# endif /* SUNOS_5 */
+# endif /* HAVE_LIBKSTAT */
 
 # if !defined (LDAV_DONE) && defined (hpux) && defined (HAVE_PSTAT_GETDYNAMIC)
 /* Use pstat_getdynamic() because we don't have to be root.  */
@@ -818,7 +824,7 @@ getloadavg (loadavg, nelem)
        : (load_ave.tl_avenrun.l[0] / (double) load_ave.tl_lscale));
 # endif        /* OSF_MIPS */
 
-# if !defined (LDAV_DONE) && (defined (MSDOS) || defined (WIN32))
+# if !defined (LDAV_DONE) && (defined (__MSDOS__) || defined (WINDOWS32))
 #  define LDAV_DONE
 
   /* A faithful emulation is going to have to be saved for a rainy day.  */
@@ -826,7 +832,7 @@ getloadavg (loadavg, nelem)
     {
       loadavg[elem] = 0.0;
     }
-# endif  /* MSDOS */
+# endif  /* __MSDOS__ || WINDOWS32 */
 
 # if !defined (LDAV_DONE) && defined (OSF_ALPHA)
 #  define LDAV_DONE