aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-08-08 13:49:37 -0400
committerUlrich Drepper <drepper@gmail.com>2011-08-08 13:49:37 -0400
commit879165f25a1a6b13995e43c11e88b1a21b6f101e (patch)
tree64b72b93baa2dd1f0f96bfb7e000c72d254f30af /ChangeLog
parent16292eddd77f66002e2104848e75a0fb4d316692 (diff)
downloadglibc-879165f25a1a6b13995e43c11e88b1a21b6f101e.tar
glibc-879165f25a1a6b13995e43c11e88b1a21b6f101e.tar.gz
glibc-879165f25a1a6b13995e43c11e88b1a21b6f101e.tar.bz2
glibc-879165f25a1a6b13995e43c11e88b1a21b6f101e.zip
Avoid multiple definitions of identical scandir cancellation handler
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f8212a61c0..4b6a62f07a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-08 Ulrich Drepper <drepper@gmail.com>
+
+ * dirent/scandir.c (cancel_handler): Renamed to
+ __scandir_cancel_handler. Do not define if SKIP_SCANDIR_CANCEL is
+ defined. Adjust users.
+ * dirent/scandir64.c: Define SKIP_SCANDIR_CANCEL.
+ * sysdeps/unix/sysv/linux/i386/scandir64.c: Likewise.
+
2011-08-04 Ulrich Drepper <drepper@gmail.com>
* string/test-string.h (IMPL): Use __STRING to expand name and then