+2011-08-10 Andreas Schwab <schwab@redhat.com>
+
+ * include/dirent.h: Add libc_hidden_proto for scandirat and
+ scandirat64. Don't declare __scandirat64.
+ * dirent/scandirat.c: Add libc_hidden_def.
+ * dirent/scandirat64.c (SCANDIRAT): Remove underscores.
+ * sysdeps/unix/sysv/linux/i386/scandir64.c (SCANDIRAT): Likewise.
+
2011-08-09 Ulrich Drepper <drepper@gmail.com>
* Versions.def [libc]: Add GLIBC_2.15.
#include <dirent.h>
-#define SCANDIRAT __scandirat64
+#define SCANDIRAT scandirat64
#define READDIR __readdir64
#define DIRENT_TYPE struct dirent64
#define SKIP_SCANDIR_CANCEL 1
#include "scandirat.c"
-
-weak_alias (__scandirat64, scandirat64)
int (*__selector) (__const struct dirent64 *),
int (*__cmp) (__const struct dirent64 **,
__const struct dirent64 **));
-extern int __scandirat64 (int __dfd, __const char * __dir,
- struct dirent64 *** __namelist,
- int (*__selector) (__const struct dirent64 *),
- int (*__cmp) (__const struct dirent64 **,
- __const struct dirent64 **));
extern __ssize_t __getdents (int __fd, char *__buf, size_t __nbytes)
internal_function;
extern __ssize_t __getdents64 (int __fd, char *__buf, size_t __nbytes)
extern void __scandir_cancel_handler (void *arg);
libc_hidden_proto (rewinddir)
+libc_hidden_proto (scandirat)
+libc_hidden_proto (scandirat64)
#endif
#include <dirent.h>
#define SCANDIR __scandir64
-#define SCANDIRAT __scandirat64
+#define SCANDIRAT scandirat64
#define READDIR __readdir64
#define DIRENT_TYPE struct dirent64
#define SKIP_SCANDIR_CANCEL 1