aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert2011-02-15 16:33:44 -0800
committerPaul Eggert2011-02-15 16:33:44 -0800
commit1f5d53eb532df40b6c41d25a8b1eaf4ccf69d518 (patch)
tree344ee816d4cbc354fb53a4d4a31bfad28f2e1bff /admin
parent7127b760aed65cd08fbba67b8ad14f1840532b45 (diff)
downloademacs-1f5d53eb532df40b6c41d25a8b1eaf4ccf69d518.tar.gz
emacs-1f5d53eb532df40b6c41d25a8b1eaf4ccf69d518.zip
Import getloadavg module from gnulib.
Diffstat (limited to 'admin')
-rw-r--r--admin/CPP-DEFINES6
-rw-r--r--admin/ChangeLog6
-rw-r--r--admin/notes/copyright1
3 files changed, 6 insertions, 7 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 7febc93bb33..dae6202b4e4 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -62,8 +62,6 @@ SIGTYPE
62SYSTEM_TYPE 62SYSTEM_TYPE
63 63
64** Machine specific macros, decribed in detail in src/m/template.h 64** Machine specific macros, decribed in detail in src/m/template.h
65LOAD_AVE_CVT
66LOAD_AVE_TYPE
67VIRT_ADDR_VARIES 65VIRT_ADDR_VARIES
68 66
69** Misc macros 67** Misc macros
@@ -111,7 +109,6 @@ EMACS_INT
111EMACS_UINT 109EMACS_UINT
112FILE_SYSTEM_CASE 110FILE_SYSTEM_CASE
113FLOAT_CHECK_DOMAIN 111FLOAT_CHECK_DOMAIN
114FSCALE
115GC_LISP_OBJECT_ALIGNMENT 112GC_LISP_OBJECT_ALIGNMENT
116GC_MARK_SECONDARY_STACK 113GC_MARK_SECONDARY_STACK
117GC_MARK_STACK 114GC_MARK_STACK
@@ -193,8 +190,6 @@ HPUX
193INTERNAL_TERMINAL 190INTERNAL_TERMINAL
194IS_ANY_SEP 191IS_ANY_SEP
195IS_DIRECTORY_SEP 192IS_DIRECTORY_SEP
196KERNEL_FILE
197LDAV_SYMBOL
198LINKER 193LINKER
199LINUX_VERSION_CODE 194LINUX_VERSION_CODE
200LISP_FLOAT_TYPE 195LISP_FLOAT_TYPE
@@ -381,4 +376,3 @@ vfork
381wait 376wait
382write 377write
383xfree 378xfree
384
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 5f4dd11ec0f..64d6de69d10 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
12011-02-16 Paul Eggert <eggert@cs.ucla.edu>
2
3 Remove no-longer needed getloadavg symbols.
4 * CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE):
5 (LDAV_SYMBOL): Remove.
6
12011-02-12 Glenn Morris <rgm@gnu.org> 72011-02-12 Glenn Morris <rgm@gnu.org>
2 8
3 * bzrmerge.el (bzrmerge-resolve): Fix bzr revert call. 9 * bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.
diff --git a/admin/notes/copyright b/admin/notes/copyright
index e4077caf77b..32a096c928d 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -631,7 +631,6 @@ alone (may import them from Gnulib again). These are:
631 warn-on-use.h 631 warn-on-use.h
632 lib/*.[ch] 632 lib/*.[ch]
633 lib/gnulib.mk 633 lib/gnulib.mk
634 src/getloadavg.c
635 src/gmalloc.c 634 src/gmalloc.c
636 src/md5.c 635 src/md5.c
637 src/md5.h 636 src/md5.h