[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103329: Import IRIX 6.5 getloadavg f
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103329: Import IRIX 6.5 getloadavg fixes from gnulib. |
Date: |
Thu, 17 Feb 2011 23:41:43 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103329
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2011-02-17 23:41:43 -0800
message:
Import IRIX 6.5 getloadavg fixes from gnulib.
* configure, lib/getloadavg.c, m4/getloadavg.m4: Regenerate.
modified:
ChangeLog
configure
lib/getloadavg.c
m4/getloadavg.m4
=== modified file 'ChangeLog'
--- a/ChangeLog 2011-02-16 00:33:44 +0000
+++ b/ChangeLog 2011-02-18 07:41:43 +0000
@@ -1,3 +1,8 @@
+2011-02-18 Paul Eggert <address@hidden>
+
+ Import IRIX 6.5 getloadavg fixes from gnulib.
+ * configure, lib/getloadavg.c, m4/getloadavg.m4: Regenerate.
+
2011-02-16 Paul Eggert <address@hidden>
Import getloadavg module from gnulib.
=== modified file 'configure'
--- a/configure 2011-02-16 08:39:19 +0000
+++ b/configure 2011-02-18 07:41:43 +0000
@@ -14475,6 +14475,8 @@
gl_save_LIBS=$LIBS
+# getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0,
+# NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7.
ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
if test "x$ac_cv_func_getloadavg" = xyes; then :
=== modified file 'lib/getloadavg.c'
--- a/lib/getloadavg.c 2011-02-16 00:33:44 +0000
+++ b/lib/getloadavg.c 2011-02-18 07:41:43 +0000
@@ -508,7 +508,7 @@
elem = -1;
# endif
-# if !defined (LDAV_DONE) && defined (HAVE_LIBKSTAT)
+# if !defined (LDAV_DONE) && defined (HAVE_LIBKSTAT) /* Solaris <= 2.6 */
/* Use libkstat because we don't have to be root. */
# define LDAV_DONE
kstat_ctl_t *kc;
@@ -559,6 +559,7 @@
# endif /* HAVE_LIBKSTAT */
# if !defined (LDAV_DONE) && defined (hpux) && defined (HAVE_PSTAT_GETDYNAMIC)
+ /* HP-UX */
/* Use pstat_getdynamic() because we don't have to be root. */
# define LDAV_DONE
# undef LOAD_AVE_TYPE
@@ -575,7 +576,7 @@
# endif /* hpux && HAVE_PSTAT_GETDYNAMIC */
-# if ! defined LDAV_DONE && defined HAVE_LIBPERFSTAT
+# if ! defined LDAV_DONE && defined HAVE_LIBPERFSTAT /* AIX */
# define LDAV_DONE
# undef LOAD_AVE_TYPE
/* Use perfstat_cpu_total because we don't have to be root. */
@@ -592,6 +593,7 @@
# endif
# if !defined (LDAV_DONE) && (defined (__linux__) || defined (__CYGWIN__))
+ /* Linux without glibc, Cygwin */
# define LDAV_DONE
# undef LOAD_AVE_TYPE
@@ -648,7 +650,7 @@
# endif /* __linux__ || __CYGWIN__ */
-# if !defined (LDAV_DONE) && defined (__NetBSD__)
+# if !defined (LDAV_DONE) && defined (__NetBSD__) /* NetBSD < 0.9 */
# define LDAV_DONE
# undef LOAD_AVE_TYPE
@@ -680,7 +682,7 @@
# endif /* __NetBSD__ */
-# if !defined (LDAV_DONE) && defined (NeXT)
+# if !defined (LDAV_DONE) && defined (NeXT) /* NeXTStep */
# define LDAV_DONE
/* The NeXT code was adapted from iscreen 3.2. */
@@ -842,6 +844,7 @@
# endif /* OSF_MIPS */
# if !defined (LDAV_DONE) && (defined (__MSDOS__) || defined (WINDOWS32))
+ /* DJGPP */
# define LDAV_DONE
/* A faithful emulation is going to have to be saved for a rainy day. */
@@ -851,7 +854,7 @@
}
# endif /* __MSDOS__ || WINDOWS32 */
-# if !defined (LDAV_DONE) && defined (OSF_ALPHA)
+# if !defined (LDAV_DONE) && defined (OSF_ALPHA) /* OSF/1 */
# define LDAV_DONE
struct tbl_loadavg load_ave;
@@ -863,7 +866,7 @@
: (load_ave.tl_avenrun.l[elem] / (double) load_ave.tl_lscale));
# endif /* OSF_ALPHA */
-# if ! defined LDAV_DONE && defined __VMS
+# if ! defined LDAV_DONE && defined __VMS /* VMS */
/* VMS specific code -- read from the Load Ave driver. */
LOAD_AVE_TYPE load_ave[3];
@@ -907,6 +910,7 @@
# endif /* ! defined LDAV_DONE && defined __VMS */
# if ! defined LDAV_DONE && defined LOAD_AVE_TYPE && ! defined __VMS
+ /* IRIX, other old systems */
/* UNIX-specific code -- read the average from /dev/kmem. */
@@ -948,9 +952,7 @@
}
# endif /* !SUNOS_5 */
# else /* sgi */
- int ldav_off;
-
- ldav_off = sysmp (MP_KERNADDR, MPKA_AVENRUN);
+ ptrdiff_t ldav_off = sysmp (MP_KERNADDR, MPKA_AVENRUN);
if (ldav_off != -1)
offset = (long int) ldav_off & 0x7fffffff;
# endif /* sgi */
=== modified file 'm4/getloadavg.m4'
--- a/m4/getloadavg.m4 2011-02-16 00:33:44 +0000
+++ b/m4/getloadavg.m4 2011-02-18 07:41:43 +0000
@@ -26,6 +26,8 @@
gl_save_LIBS=$LIBS
+# getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0,
+# NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7.
AC_CHECK_FUNC([getloadavg], [],
[gl_have_func=no
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103329: Import IRIX 6.5 getloadavg fixes from gnulib.,
Paul Eggert <=