Merge from mainline.

[bpt/emacs.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 9fbc83f..356637b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -487,6 +487,32 @@
        position in the line even if it is not displayed due to
        hscrolling.  (Bug#7939)
 
+2011-02-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Remove no-longer needed getloadavg symbols.
+       * m/alpha.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
+       * m/amdx86-64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
+       * m/ia64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
+       * m/ibms390.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
+       * m/macppc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
+       * m/sparc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
+       * m/template.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
+       * m/vax.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
+       * s/aix4-2.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
+       * s/bsd-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove #undef.
+       * s/hpux10-20.h (KERNEL_FILE, LOAD_AVE_TYPE, LOAD_AVE_CVT):
+       (LDAV_SYMBOL): Remove.
+       * s/unixware.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE): Remove.
+       * s/usg5-4-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
+
+       Import getloadavg module from gnulib.
+       * deps.mk (getloadavg.o): Remove; gnulib now does this.
+       * lisp.h (getloadavg) [!defined HAVE_GETLOADAVG]: Remove; gnulib
+       now does this.
+       * src/s/freebsd.h (HAVE_GETLOADAVG): Remove; gnulib now does this.
+       * src/s/netbsd.h (HAVE_GETLOADAVG): Likewise.
+       * config.in: Regenerate.
+
 2011-02-12  Paul Eggert  <eggert@cs.ucla.edu>
 
        Port to Sun C 5.11, which has __attribute__ ((__aligned (N))).