1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00

Merge from mainline.

This commit is contained in:
Paul Eggert 2011-02-15 17:35:20 -08:00
commit 0ca2f89e09
3 changed files with 49 additions and 2 deletions

View File

@ -1,3 +1,24 @@
2011-02-16 Paul Eggert <eggert@cs.ucla.edu>
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 <eggert@cs.ucla.edu>
Merge from proposed getloadavg simplifications in gnulib.

View File

@ -1,4 +1,4 @@
2011-02-15 Paul Eggert <eggert@cs.ucla.edu>
2011-02-16 Paul Eggert <eggert@cs.ucla.edu>
Remove no-longer needed getloadavg symbols.
* CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE):

View File

@ -1,3 +1,29 @@
2011-02-16 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-15 Eli Zaretskii <eliz@gnu.org>
* nsfns.m (ns_set_name_as_filename, Fns_read_file_name): Use B_.
@ -9,7 +35,7 @@
2011-02-14 Eli Zaretskii <eliz@gnu.org>
* msdos.c (IT_frame_up_to_date):
* msdos.c (IT_frame_up_to_date):
* s/msdos.h (MODE_LINE_BINARY_TEXT): Use B_ for the MS-DOS build.
* dired.c (directory_files_internal):