+2012-07-10 Paul Eggert <eggert@cs.ucla.edu>
+
+ getloadavg: clean out old Emacs and Autoconf cruft
+ See Glenn Morris in <http://bugs.gnu.org/11905>.
+ * lib/getloadavg.c: Include <config.h>, <stdbool.h> always.
+ Include <sys/param.h> if HAVE_SYS_PARAM_H, not if unix or __unix.
+ (LDAV_CVT): Remove no-longer-used LOAD_AVE_CVT hook.
+ * m4/getloadavg.m4 (gl_PREREQ_GETLOADAVG): Check for <sys/param.h>.
+
2012-07-10 Akim Demaille <akim@lrde.epita.fr>
bootstrap: let warn be like tests/init.sh's warn_
We also #define LDAV_PRIVILEGED if a program will require
special installation to be able to call getloadavg. */
-/* "configure" defines CONFIGURING_GETLOADAVG to sidestep problems
- with partially-configured source directories. */
-
-#ifndef CONFIGURING_GETLOADAVG
-# include <config.h>
-# include <stdbool.h>
-#endif
+#include <config.h>
/* Specification. */
#include <stdlib.h>
#include <errno.h>
+#include <stdbool.h>
#include <stdio.h>
# include <sys/types.h>
-/* Both the Emacs and non-Emacs sections want this. Some
- configuration files' definitions for the LOAD_AVE_CVT macro (like
- sparc.h's) use macros like FSCALE, defined here. */
-# if defined (unix) || defined (__unix)
+# if HAVE_SYS_PARAM_H
# include <sys/param.h>
# endif
# include "intprops.h"
-/* The existing Emacs configuration files define a macro called
- LOAD_AVE_CVT, which accepts a value of type LOAD_AVE_TYPE, and
- returns the load average multiplied by 100. What we actually want
- is a macro called LDAV_CVT, which returns the load average as an
- unmultiplied double.
-
- For backwards compatibility, we'll define LDAV_CVT in terms of
- LOAD_AVE_CVT, but future machine config files should just define
- LDAV_CVT directly. */
-
-# if !defined (LDAV_CVT) && defined (LOAD_AVE_CVT)
-# define LDAV_CVT(n) (LOAD_AVE_CVT (n) / 100.0)
-# endif
-
# if !defined (BSD) && defined (ultrix)
/* Ultrix behaves like BSD on Vaxen. */
# define BSD
[
# Figure out what our getloadavg.c needs.
+AC_CHECK_HEADERS_ONCE([sys/param.h])
+
# On HPUX9, an unprivileged user can get load averages this way.
if test $gl_func_getloadavg_done = no; then
AC_CHECK_FUNCS([pstat_getdynamic], [gl_func_getloadavg_done=yes])