2014-11-12 Joseph Myers <joseph@codesourcery.com>
+ [BZ #17584]
+ * dirent/rewinddir.c (rewinddir): Rename to __rewinddir and define
+ as weak alias of __rewinddir. Don't use libc_hidden_def.
+ (__rewinddir): Use libc_hidden_def.
+ * sysdeps/mach/hurd/rewinddir.c: Rename to __rewinddir and define
+ as weak alias of __rewinddir. Don't use libc_hidden_def.
+ (__rewinddir): Use libc_hidden_def.
+ * sysdeps/posix/rewinddir.c: Rename to __rewinddir and define as
+ weak alias of __rewinddir. Don't use libc_hidden_def.
+ (__rewinddir): Use libc_hidden_def.
+ * include/dirent.h (rewinddir): Don't use libc_hidden_proto.
+ (__rewinddir): Use libc_hidden_proto.
+ * sysdeps/posix/getcwd.c [!_LIBC] (__rewinddir): Define to
+ rewinddir.
+ (__getcwd): Use __rewinddir instead of rewinddir.
+
[BZ #17583]
* libio/fileno.c (fileno): Rename to __fileno and define as weak
alias of __fileno. Use libc_hidden_weak.
6652, 12926, 14132, 14138, 14171, 15215, 15884, 17266, 17344, 17363,
17370, 17371, 17411, 17460, 17475, 17485, 17501, 17506, 17508, 17522,
- 17555, 17583.
+ 17555, 17583, 17584.
* New locales: tu_IN, bh_IN.
\f
/* Rewind DIRP to the beginning of the directory. */
void
-rewinddir (dirp)
+__rewinddir (dirp)
DIR *dirp;
{
__set_errno (ENOSYS);
/* No way to indicate failure. */
}
-libc_hidden_def (rewinddir)
+libc_hidden_def (__rewinddir)
+weak_alias (__rewinddir, rewinddir)
stub_warning (rewinddir)
const struct stat64 *statp)
internal_function;
extern void __scandir_cancel_handler (void *arg);
+extern __typeof (rewinddir) __rewinddir;
-libc_hidden_proto (rewinddir)
+libc_hidden_proto (__rewinddir)
libc_hidden_proto (scandirat)
libc_hidden_proto (scandirat64)
# endif
/* Rewind DIRP to the beginning of the directory. */
void
-rewinddir (dirp)
+__rewinddir (dirp)
DIR *dirp;
{
seekdir (dirp, (off_t) 0L);
}
-libc_hidden_def (rewinddir)
+libc_hidden_def (__rewinddir)
+weak_alias (__rewinddir, rewinddir)
#ifndef __GNU_LIBRARY__
# define __lstat64 stat64
#endif
+
+#ifndef _LIBC
+# define __rewinddir rewinddir
+#endif
\f
#ifndef _LIBC
# define __getcwd getcwd
if (use_d_ino)
{
use_d_ino = false;
- rewinddir (dirstream);
+ __rewinddir (dirstream);
continue;
}
/* Rewind DIRP to the beginning of the directory. */
void
-rewinddir (dirp)
+__rewinddir (dirp)
DIR *dirp;
{
#ifndef NOT_IN_libc
__libc_lock_unlock (dirp->lock);
#endif
}
-libc_hidden_def (rewinddir)
+libc_hidden_def (__rewinddir)
+weak_alias (__rewinddir, rewinddir)