diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-10 16:50:06 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-10 16:50:29 -0700 |
| commit | dd91a295844a6e89ce67087164ea0f2e979b4b70 (patch) | |
| tree | 60434ac7d524dccd0ef761fbff060f7a2cace5d1 /lib | |
| parent | 4df9d155485595d7bae28d434a945f9c22dd1a71 (diff) | |
| download | gnulib-dd91a295844a6e89ce67087164ea0f2e979b4b70.tar.gz | |
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>.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/getloadavg.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/lib/getloadavg.c b/lib/getloadavg.c index 79ea71787a..a8ffefee33 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -80,45 +80,23 @@ 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 |