AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Ulrich Drepper 2011-06-03 07:02:32 -04:00
commit 06c07b8b9f
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 @@
* sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features):
Assume Intel Core i3/i5/i7 processor if AVX is available.
2011-05-31 Ulrich Drepper <drepper@gmail.com>
* sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard): Fix
typo.
2011-05-31 Andreas Schwab <schwab@redhat.com>
* nscd/nscd_getserv_r.c (nscd_getserv_r): Don't free non-malloced

2
sysdeps/unix/sysv/linux/dl-osinfo.h
View File

@ -81,7 +81,7 @@ _dl_setup_stack_chk_guard (void *dl_random)
{
ssize_t reslen = read_not_cancel (fd, ret.bytes + 1, filllen);
close_not_cancel_no_status (fd);
if (reslen == (ssize_) filllen)
if (reslen == (ssize_t) filllen)
return ret.num;
}
# endif