diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-12-02 17:19:10 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-12-02 17:19:10 +0000 |
| commit | 207e6eacd86cbc50bc1f78b06709b93a085dd9d8 (patch) | |
| tree | 9abd9f8a20beb2f95b34e1e5a16c501dc87fcfcf /libc/sysdeps/unix/sysv/linux/futimes.c | |
| parent | 709390fe0688830722a221c3d8a49a85855f7232 (diff) | |
Merge changes between r15868 and r16068 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@16069 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix/sysv/linux/futimes.c')
| -rw-r--r-- | libc/sysdeps/unix/sysv/linux/futimes.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/sysdeps/unix/sysv/linux/futimes.c b/libc/sysdeps/unix/sysv/linux/futimes.c index 272b83eb0..cd3cce618 100644 --- a/libc/sysdeps/unix/sysv/linux/futimes.c +++ b/libc/sysdeps/unix/sysv/linux/futimes.c @@ -1,5 +1,5 @@ /* futimes -- change access and modification times of open file. Linux version. - Copyright (C) 2002,2003,2005,2006,2007 Free Software Foundation, Inc. + Copyright (C) 2002,2003,2005,2006,2007,2011 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 @@ -95,8 +95,8 @@ __futimes (int fd, const struct timeval tvp[2]) if (tvp != NULL) { times = &buf; - buf.actime = tvp[0].tv_sec + (tvp[0].tv_usec + 500000) / 1000000; - buf.modtime = tvp[1].tv_sec + (tvp[1].tv_usec + 500000) / 1000000; + buf.actime = tvp[0].tv_sec; + buf.modtime = tvp[1].tv_sec; } else times = NULL; |