aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-11-11 13:29:12 -0500
committerUlrich Drepper <drepper@gmail.com>2011-11-11 13:29:12 -0500
commit1d8f7ddc04a4782c1bf2d6f48ce40e7d57caa920 (patch)
treeb80014598ade05556449724881c200b49b5ffd2d /include
parentaaddc98c25727f896fc8ed36c5562dc46865dbe6 (diff)
parent95b7042bac3e2cfc6fef7aec6acc7d46dd50eba5 (diff)
downloadglibc-1d8f7ddc04a4782c1bf2d6f48ce40e7d57caa920.tar.xz
glibc-1d8f7ddc04a4782c1bf2d6f48ce40e7d57caa920.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'include')
-rw-r--r--include/unistd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/unistd.h b/include/unistd.h
index 5014e2e772..3231943b02 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -117,7 +117,7 @@ extern int __ttyname_r (int __fd, char *__buf, size_t __buflen);
extern int __isatty (int __fd);
extern int __link (__const char *__from, __const char *__to);
extern int __symlink (__const char *__from, __const char *__to);
-extern int __readlink (__const char *__path, char *__buf, size_t __len);
+extern ssize_t __readlink (__const char *__path, char *__buf, size_t __len);
extern int __unlink (__const char *__name);
extern int __gethostname (char *__name, size_t __len);
extern int __profil (unsigned short int *__sample_buffer, size_t __size,