From: Paul Eggert Date: Wed, 16 Feb 2011 01:35:20 +0000 (-0800) Subject: Merge from mainline. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~794^2~5 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ca2f89e09202a02f392c1defba2105b69c01419;p=emacs.git Merge from mainline. --- 0ca2f89e09202a02f392c1defba2105b69c01419 diff --cc ChangeLog index 20083294875,7a9252cb9f8..6d4f6e042e0 --- a/ChangeLog +++ b/ChangeLog @@@ -1,11 -1,24 +1,32 @@@ + 2011-02-16 Paul Eggert + + Import getloadavg module from gnulib. + * .bzrignore: Add lib/stdlib.h. + * Makefile.in (GNULIB_MODULES): Add getloadavg. + * admin/notes/copyright: Remove src/getloadavg.c as a special case. + * configure.in (LIBS_SYSTEM): Omit -lkstat on sol2*; gnulib does this. + (AC_CONFIG_LIBOBJ_DIR, AC_FUNC_GETLOADAVG, GETLOADAVG_FILES): + Remove; gnulib does this now. + * lib/getloadavg.c: Rename from src/getloadavg.c, and sync + from gnulib. This adds support for several other systems, such + as Tru64 4.0D, QNX, AIX perfstat, etc. It also fixes a potential + buffer overrun on Linux hosts under very high load, and on hosts + that maintain a channel to the load average file it makes sure + the file descriptor is close-on-exec (on hosts that support this) + and is not stdin, stdout, or stderr. + * lib/stdlib.in.h, m4/getloadavg.m4, m4/stdlib_h.m4: New files, + from gnulib. + * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4: + * src/config.in: Regenerate. + +2011-02-15 Paul Eggert + + Merge from proposed getloadavg simplifications in gnulib. + + * configure, lib/Makefile.in, src/config.in: Regenerate. + * lib/getloadavg.c, lib/stdlib.in.h, m4/getloadavg.m4: New + versions from gnulib. + 2011-02-15 Paul Eggert Merge from gnulib.