qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://sourceware.org/git/glibc 

Conflicts:
	ChangeLog
This commit is contained in:
Ulrich Drepper 2011-11-11 13:29:12 -05:00
parent aaddc98c25 95b7042bac
commit 1d8f7ddc04
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -3,6 +3,11 @@
* libio/wfileops.c (_IO_wfile_underflow_mmap): Remove unused variable. * libio/wfileops.c (_IO_wfile_underflow_mmap): Remove unused variable.
* sysdeps/ieee754/dbl-64/mpsqrt.c (__mpsqrt): Likewise. * sysdeps/ieee754/dbl-64/mpsqrt.c (__mpsqrt): Likewise.
2011-11-11 Roland McGrath <roland@hack.frob.com>
* include/unistd.h: Fix __readlink return type.
Reported by Chris Metcalf <cmetcalf@tilera.com>.
2011-11-11 Ulrich Drepper <drepper@gmail.com> 2011-11-11 Ulrich Drepper <drepper@gmail.com>
* stdlib/ucontext.h: Undo last change for makecontext. * stdlib/ucontext.h: Undo last change for makecontext.

2
include/unistd.h
View File

@ -117,7 +117,7 @@ extern int __ttyname_r (int __fd, char *__buf, size_t __buflen);
extern int __isatty (int __fd); extern int __isatty (int __fd);
extern int __link (__const char *__from, __const char *__to); extern int __link (__const char *__from, __const char *__to);
extern int __symlink (__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 __unlink (__const char *__name);
extern int __gethostname (char *__name, size_t __len); extern int __gethostname (char *__name, size_t __len);
extern int __profil (unsigned short int *__sample_buffer, size_t __size, extern int __profil (unsigned short int *__sample_buffer, size_t __size,