2005-11-03 Shaun Jackman <sjackman@gmail.com>

        * libc/include/sys/unistd.h (readlink, symlink): Provide these
        prototypes by default.
        * libc/sys/linux/include/unistd.h (readlink): Remove this
        prototype.
        * libc/sys/linux/sys/unistd.h (readlink, symlink): New
        prototypes.

2 files changed, 2 insertions, 2 deletions

diff --git a/newlib/libc/sys/linux/include/unistd.h b/newlib/libc/sys/linux/include/unistd.h
index e2f562a3a..55ecc3a4e 100644
--- a/newlib/libc/sys/linux/include/unistd.h
+++ b/newlib/libc/sys/linux/include/unistd.h
@@ -15,6 +15,4 @@ extern char *optarg;
 extern int optind, opterr, optopt;
 
 
-int readlink(const char *path, char *buf, size_t bufsiz);
-
 #endif
diff --git a/newlib/libc/sys/linux/sys/unistd.h b/newlib/libc/sys/linux/sys/unistd.h
index e720d6b72..502fb473a 100644
--- a/newlib/libc/sys/linux/sys/unistd.h
+++ b/newlib/libc/sys/linux/sys/unistd.h
@@ -72,6 +72,7 @@ int     _EXFUN(pipe, (int __fildes[2] ));
 ssize_t _EXFUN(pread, (int __fd, void *__buf, size_t __nbytes, off_t __offset));
 ssize_t _EXFUN(pwrite, (int __fd, const void *__buf, size_t __nbytes, off_t __offset));
 _READ_WRITE_RETURN_TYPE _EXFUN(read, (int __fd, void *__buf, size_t __nbyte ));
+int     _EXFUN(readlink, (const char *path, char *buf, size_t bufsiz));
 int     _EXFUN(rmdir, (const char *__path ));
 void *  _EXFUN(sbrk,  (ptrdiff_t __incr));
 int     _EXFUN(setegid, (gid_t __gid ));
@@ -83,6 +84,7 @@ pid_t   _EXFUN(setsid, (void ));
 int     _EXFUN(setuid, (uid_t __uid ));
 unsigned _EXFUN(sleep, (unsigned int __seconds ));
 void    _EXFUN(swab, (const void *, void *, ssize_t));
+int     _EXFUN(symlink, (const char *oldpath, const char *newpath));
 long    _EXFUN(sysconf, (int __name ));
 pid_t   _EXFUN(tcgetpgrp, (int __fildes ));
 int     _EXFUN(tcsetpgrp, (int __fildes, pid_t __pgrp_id ));