Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
This commit is contained in:
commit
1d8f7ddc04
|
@ -3,6 +3,11 @@
|
|||
* libio/wfileops.c (_IO_wfile_underflow_mmap): Remove unused variable.
|
||||
* 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>
|
||||
|
||||
* stdlib/ucontext.h: Undo last change for makecontext.
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue