diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-06-03 07:02:32 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-06-03 07:02:32 -0400 |
| commit | 06c07b8b9fd21854c90d22b5b23196d78837262a (patch) | |
| tree | 1d6adec4505ce0935fc5663c950e2774c163dc73 | |
| parent | 3d29045b5e8329d97693eda8d98f1d1e60b99c8f (diff) | |
| parent | 8c29731192565b9c917d6b97db78dcd302283df8 (diff) | |
| download | glibc-06c07b8b9fd21854c90d22b5b23196d78837262a.tar.gz glibc-06c07b8b9fd21854c90d22b5b23196d78837262a.tar.xz glibc-06c07b8b9fd21854c90d22b5b23196d78837262a.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-osinfo.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 6a11ec67ea..64dbdc3ffa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h index eb7fedc077..28fce4f8e7 100644 --- a/sysdeps/unix/sysv/linux/dl-osinfo.h +++ b/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -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 |