[commits] r11132 - in /fsf/trunk/libc: ChangeLog hurd/hurdselect.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Aug  3 00:03:02 2010
New Revision: 11132

Log:
Import glibc-mainline for 2010-08-03

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/hurd/hurdselect.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Aug  3 00:03:02 2010
@@ -1,3 +1,8 @@
+2010-07-31  Samuel Thibault  <samuel.thibault@xxxxxxxxxxxx>
+
+	* hurd/hurdselect.c (_hurd_select): Round timeout up instead of down
+	when converting to ms.
+
 2010-07-31  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/x86_64/multiarch/Makefile [subdir=string] (sysdep_routines):

Modified: fsf/trunk/libc/hurd/hurdselect.c
==============================================================================
--- fsf/trunk/libc/hurd/hurdselect.c (original)
+++ fsf/trunk/libc/hurd/hurdselect.c Tue Aug  3 00:03:02 2010
@@ -52,7 +52,7 @@
   int firstfd, lastfd;
   mach_msg_timeout_t to = (timeout != NULL ?
 			   (timeout->tv_sec * 1000 +
-			    timeout->tv_nsec / 1000000) :
+			    (timeout->tv_nsec + 999999) / 1000000) :
 			   0);
   struct
     {