about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-06-03 07:02:32 -0400
committerUlrich Drepper <drepper@gmail.com>2011-06-03 07:02:32 -0400
commit06c07b8b9fd21854c90d22b5b23196d78837262a (patch)
tree1d6adec4505ce0935fc5663c950e2774c163dc73 /sysdeps
parent3d29045b5e8329d97693eda8d98f1d1e60b99c8f (diff)
parent8c29731192565b9c917d6b97db78dcd302283df8 (diff)
downloadglibc-06c07b8b9fd21854c90d22b5b23196d78837262a.tar.gz
glibc-06c07b8b9fd21854c90d22b5b23196d78837262a.tar.xz
glibc-06c07b8b9fd21854c90d22b5b23196d78837262a.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
	ChangeLog
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/dl-osinfo.h2
1 files changed, 1 insertions, 1 deletions
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