summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-10-09 13:17:46 -0400
committerUlrich Drepper <drepper@gmail.com>2011-10-09 13:17:46 -0400
commitd9db0846f214b39d2ecb58ab6cd7178a38dd401e (patch)
tree3fb0f99960a29a322849312b781c0fa3a06b6ad2 /ChangeLog
parentc853acd567ed81e9493b1f7825e00334a8c7fc0b (diff)
parent110946e473b38fc3896212e416d9d7064fecd5b7 (diff)
downloadglibc-d9db0846f214b39d2ecb58ab6cd7178a38dd401e.tar.gz
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog13
1 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f08e63539..de8e8aa3a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
* po/ja.po: Update from translation team.
+2011-10-08 Roland McGrath <roland@hack.frob.com>
+
+ * locale/programs/locarchive.c (prepare_address_space): New function.
+ (create_archive, enlarge_archive, open_archive): Use it.
+
+ * sysdeps/unix/sysv/linux/x86_64/time.c: Move #include <dl-vdso.h>
+ inside [SHARED], where it is used.
+
+ * nscd/nscd_proto.h: Declare __nscd_setnetgrent.
+
+ * nss/getent.c (netgroup_keys): Remove unused variable.
+ * sysdeps/ieee754/flt-32/s_isinf_nsf.c: Likewise.
+
2011-10-08 Ulrich Drepper <drepper@gmail.com>
* include/math.h: Declare __isinf_ns, __isinf_nsf, __isinf_nsl.