diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-01-06 14:57:16 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-01-06 14:57:16 +0000 |
| commit | 0ecfa2580d1aedb744deb5af1b60f92c69b9e9e0 (patch) | |
| tree | 1ef0d0dc09dba23037800d5f3794a77d9b45554f /sysdeps/unix/alarm.c | |
| parent | e4f5d077e9190f57abd49684bd7afcf4325bd348 (diff) | |
| download | glibc-0ecfa2580d1aedb744deb5af1b60f92c69b9e9e0.tar glibc-0ecfa2580d1aedb744deb5af1b60f92c69b9e9e0.tar.gz glibc-0ecfa2580d1aedb744deb5af1b60f92c69b9e9e0.tar.bz2 glibc-0ecfa2580d1aedb744deb5af1b60f92c69b9e9e0.zip | |
Updated to fedora-glibc-20050106T1443
Diffstat (limited to 'sysdeps/unix/alarm.c')
| -rw-r--r-- | sysdeps/unix/alarm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sysdeps/unix/alarm.c b/sysdeps/unix/alarm.c index ae77782c54..84ab5a52fe 100644 --- a/sysdeps/unix/alarm.c +++ b/sysdeps/unix/alarm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,94,97,2002 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1994,1997,2002,2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -41,7 +41,10 @@ alarm (seconds) return 0; retval = old.it_value.tv_sec; - if (old.it_value.tv_usec) + /* Round to the nearest second, but never report zero seconds when + the alarm is still set. */ + if (old.it_value.tv_usec >= 500000 + || (retval == 0 && old.it_value.tv_usec > 0)) ++retval; return retval; } |