+2015-02-19 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #17999]
+ * dirent/scandir.c [!SCANDIR] (SCANDIRAT): Define to __scandirat
+ instead of scandirat.
+ * dirent/scandirat.c [!SCANDIRAT] (SCANDIRAT): Likewise.
+ [!SCANDIRAT] (SCANDIRAT_WEAK_ALIAS): Define.
+ [SCANDIRAT_WEAK_ALIAS] (scandirat): Define as weak alias of
+ __scandirat.
+ * include/dirent.h (scandirat): Do not use libc_hidden_proto.
+ (__scandirat): Declare. Use libc_hidden_proto.
+ * conform/Makefile (test-xfail-POSIX2008/dirent.h/linknamespace):
+ Remove variable.
+ (test-xfail-XOPEN2K8/dirent.h/linknamespace): Likewise.
+
2015-02-18 Joseph Myers <joseph@codesourcery.com>
[BZ #15319]
* The following bugs are resolved with this release:
4719, 15319, 15467, 15790, 16560, 17569, 17792, 17912, 17932, 17944,
- 17949, 17964, 17965, 17967, 17969, 17978, 17987, 17991, 17996.
+ 17949, 17964, 17965, 17967, 17969, 17978, 17987, 17991, 17996, 17999.
\f
Version 2.21
test-xfail-XOPEN2K/ucontext.h/linknamespace = yes
test-xfail-XOPEN2K/unistd.h/linknamespace = yes
test-xfail-XOPEN2K/wordexp.h/linknamespace = yes
-test-xfail-POSIX2008/dirent.h/linknamespace = yes
test-xfail-POSIX2008/grp.h/linknamespace = yes
test-xfail-POSIX2008/netdb.h/linknamespace = yes
test-xfail-POSIX2008/regex.h/linknamespace = yes
test-xfail-POSIX2008/semaphore.h/linknamespace = yes
test-xfail-POSIX2008/unistd.h/linknamespace = yes
-test-xfail-XOPEN2K8/dirent.h/linknamespace = yes
test-xfail-XOPEN2K8/fmtmsg.h/linknamespace = yes
test-xfail-XOPEN2K8/grp.h/linknamespace = yes
test-xfail-XOPEN2K8/netdb.h/linknamespace = yes
#ifndef SCANDIR
# define SCANDIR scandir
-# define SCANDIRAT scandirat
+# define SCANDIRAT __scandirat
# define DIRENT_TYPE struct dirent
#endif
#include <bits/libc-lock.h>
#ifndef SCANDIRAT
-# define SCANDIRAT scandirat
+# define SCANDIRAT __scandirat
# define READDIR __readdir
# define DIRENT_TYPE struct dirent
+# define SCANDIRAT_WEAK_ALIAS
#endif
#ifndef SKIP_SCANDIR_CANCEL
return c.cnt;
}
libc_hidden_def (SCANDIRAT)
+#ifdef SCANDIRAT_WEAK_ALIAS
+weak_alias (__scandirat, scandirat)
+#endif
#ifdef _DIRENT_MATCHES_DIRENT64
weak_alias (scandirat, scandirat64)
extern __typeof (rewinddir) __rewinddir;
libc_hidden_proto (__rewinddir)
-libc_hidden_proto (scandirat)
+extern __typeof (scandirat) __scandirat;
+libc_hidden_proto (__scandirat)
libc_hidden_proto (scandirat64)
# endif