From 879165f25a1a6b13995e43c11e88b1a21b6f101e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 8 Aug 2011 13:49:37 -0400 Subject: Avoid multiple definitions of identical scandir cancellation handler --- ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index f8212a6..4b6a62f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-08-08 Ulrich Drepper + + * 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 * string/test-string.h (IMPL): Use __STRING to expand name and then -- cgit v1.1